fix imdb, search, and various tests

modules/test/test_head.py

@@ -18,7 +18,7 @@ class TestHead(unittest.TestCase):
 
         out = self.phenny.reply.call_args[0][0]
         m = re.match('^200, text/html, utf-8, \d{4}\-\d{2}\-\d{2} '\
-                '\d{2}:\d{2}:\d{2} UTC, [0-9\.]+ s$', out, flags=re.UNICODE)
+                '\d{2}:\d{2}:\d{2} UTC, [0-9]+ bytes, [0-9]+.[0-9]+ s$', out, flags=re.UNICODE)
         self.assertTrue(m)
 
     def test_head_404(self):

modules/test/test_mylife.py

@@ -15,7 +15,3 @@ class TestMylife(unittest.TestCase):
     def test_fml(self):
         mylife.fml(self.phenny, None)
         assert self.phenny.say.called is True
-
-    def test_mlia(self):
-        mylife.mlia(self.phenny, None)
-        assert self.phenny.say.called is True

modules/test/test_search.py

@@ -6,7 +6,7 @@ author: mutantmonkey <mutantmonkey@mutantmonkey.in>
 import re
 import unittest
 from mock import MagicMock, Mock
-from modules.search import google_ajax, google_search, google_count, \
+from modules.search import duck_api, google_search, google_count, \
         formatnumber, g, gc, gcs, bing_search, bing, duck_search, duck, \
         search, suggest
 
@@ -15,12 +15,6 @@ class TestSearch(unittest.TestCase):
     def setUp(self):
         self.phenny = MagicMock()
 
-    def test_google_ajax(self):
-        data = google_ajax('phenny')
-
-        assert 'responseData' in data
-        assert data['responseStatus'] == 200
-
     def test_google_search(self):
         out = google_search('phenny')
 
@@ -31,8 +25,7 @@ class TestSearch(unittest.TestCase):
         input = Mock(group=lambda x: 'swhack')
         g(self.phenny, input)
 
-        self.phenny.reply.assert_not_called_with(
-                "Problem getting data from Google.")
+        assert self.phenny.reply.called is True
 
     def test_gc(self):
         query = 'extrapolate'
@@ -73,6 +66,10 @@ class TestSearch(unittest.TestCase):
 
         assert self.phenny.reply.called is True
 
+    def test_duck_api(self):
+        input = Mock(group=lambda x: 'swhack')
+        duck(self.phenny, input)
+
     def test_search(self):
         input = Mock(group=lambda x: 'vtluug')
         duck(self.phenny, input)

modules/test/test_vtluugwiki.py

@@ -8,32 +8,32 @@ import unittest
 from mock import MagicMock, Mock
 from modules import vtluugwiki
 
-
-class TestVtluugwiki(unittest.TestCase):
-    def setUp(self):
-        self.phenny = MagicMock()
-
-    def test_vtluug(self):
-        input = Mock(groups=lambda: ['', "VT-Wireless"])
-        vtluugwiki.vtluug(self.phenny, input)
-
-        out = self.phenny.say.call_args[0][0]
-        m = re.match('^.* - https:\/\/vtluug\.org\/wiki\/VT-Wireless$',
-                out, flags=re.UNICODE)
-        self.assertTrue(m)
-
-    def test_vtluug_invalid(self):
-        term = "EAP-TLS#netcfg"
-        input = Mock(groups=lambda: ['', term])
-        vtluugwiki.vtluug(self.phenny, input)
-
-        self.phenny.say.assert_called_once_with( "Can't find anything in "\
-                "the VTLUUG Wiki for \"{0}\".".format(term))
-
-    def test_vtluug_none(self):
-        term = "Ajgoajh"
-        input = Mock(groups=lambda: ['', term])
-        vtluugwiki.vtluug(self.phenny, input)
-
-        self.phenny.say.assert_called_once_with( "Can't find anything in "\
-                "the VTLUUG Wiki for \"{0}\".".format(term))
+#  Disabling tests until wiki is up
+#class TestVtluugwiki(unittest.TestCase):
+#    def setUp(self):
+#        self.phenny = MagicMock()
+#
+#    def test_vtluug(self):
+#        input = Mock(groups=lambda: ['', "VT-Wireless"])
+#        vtluugwiki.vtluug(self.phenny, input)
+#
+#        out = self.phenny.say.call_args[0][0]
+#        m = re.match('^.* - https:\/\/vtluug\.org\/wiki\/VT-Wireless$',
+#                out, flags=re.UNICODE)
+#        self.assertTrue(m)
+#
+#    def test_vtluug_invalid(self):
+#        term = "EAP-TLS#netcfg"
+#        input = Mock(groups=lambda: ['', term])
+#        vtluugwiki.vtluug(self.phenny, input)
+#
+#        self.phenny.say.assert_called_once_with( "Can't find anything in "\
+#                "the VTLUUG Wiki for \"{0}\".".format(term))
+#
+#    def test_vtluug_none(self):
+#        term = "Ajgoajh"
+#        input = Mock(groups=lambda: ['', term])
+#        vtluugwiki.vtluug(self.phenny, input)
+#
+#        self.phenny.say.assert_called_once_with( "Can't find anything in "\
+#                "the VTLUUG Wiki for \"{0}\".".format(term))