fix tests

d1ffuz0r · Mar 10, 2012 · 9ff3ef6 · 9ff3ef6
1 parent 713a1d4
commit 9ff3ef6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/engine.py b/engine.py
@@ -42,8 +42,8 @@ def parse(self):
         time = Online().create(date=datetime.datetime.now())
         res = {"time": time, "online": []}
         html = search(self.regexp, self.get_content()).group(1).replace('\r\n', '')
-        for line in findall(self.regexp2, html):
-            res["online"].append(add(line[0], line[1], line[2]))
+        #res["online"] = map(lambda line: add(line[0], line[1], line[2]), findall(self.regexp2, html))
+        res["online"] = [add(line[0], line[1], line[2]) for line in findall(self.regexp2, html)]
         _online_now(res)
 
     def start(self):

diff --git a/tests/database.py b/tests/database.py
@@ -45,7 +45,7 @@ def test_online(self):
     def test_get_by_nick_returns(self):
         request = db.get_by_nick(nick="Lacio")
         self.assertEqual(request["player"], [1, 1, 1, 1, 1, 1, 1, 0, 0])
-        self.assertTrue(isinstance(request["all"], SelectQuery))
+        self.assertIsInstance(request["all"], SelectQuery)
 
     def test_get_by_nick_none(self):
         request = db.get_by_nick()
@@ -54,30 +54,30 @@ def test_get_by_nick_none(self):
     def test_get_by_nick_total(self):
         request = db.get_by_nick(nick="Lacio")
         self.assertEqual(request["player"], [1, 1, 1, 1, 1, 1, 1, 0, 0])
-        self.assertTrue(isinstance(request["all"], SelectQuery))
+        self.assertIsInstance(request["all"], SelectQuery)
 
     def test_get_by_nick_from(self):
         request = db.get_by_nick(nick="Lacio", frm="15.11.2011")
         self.assertEqual(request["player"], [0, 0])
-        self.assertTrue(isinstance(request["all"], SelectQuery))
+        self.assertIsInstance(request["all"], SelectQuery)
 
     def test_get_by_nick_to(self):
         request = db.get_by_nick(nick="Lacio", to="14.11.2011")
         self.assertEqual(request["player"], [1, 1, 1, 1, 1, 1, 1])
-        self.assertTrue(isinstance(request["all"], SelectQuery))
+        self.assertIsInstance(request["all"], SelectQuery)
 
     def test_get_by_nick_from_to(self):
         request = db.get_by_nick(nick="Lacio",
                                  frm="12.11.2011",
                                  to="22.11.2011")
         self.assertEqual(request["player"], [1, 1, 1, 1, 1, 1, 1])
-        self.assertTrue(isinstance(request["all"], SelectQuery))
+        self.assertIsInstance(request["all"], SelectQuery)
 
         request1 = db.get_by_nick(nick="Lacio",
                                   frm="12.11.2011",
                                   to="27.11.2011")
         self.assertEqual(request1["player"], [1, 1, 1, 1, 1, 1, 1, 0, 0])
-        self.assertTrue(isinstance(request1["all"], SelectQuery))
+        self.assertIsInstance(request1["all"], SelectQuery)
 
 if __name__ == "__main__":
     unittest.main()