[unittest2] make standard import under py3.x (skip unittest2 support from here)

1 files changed, 16 insertions, 16 deletions

diff --git a/test/unittest_taskqueue.py b/test/unittest_taskqueue.py
index 8ae3553..345908f 100644
--- a/test/unittest_taskqueue.py
+++ b/test/unittest_taskqueue.py
@@ -22,14 +22,14 @@ from logilab.common.tasksqueue import *
 class TaskTC(TestCase):
 
     def test_eq(self):
-        self.failIf(Task('t1') == Task('t2'))
-        self.failUnless(Task('t1') == Task('t1'))
+        self.assertFalse(Task('t1') == Task('t2'))
+        self.assertTrue(Task('t1') == Task('t1'))
 
     def test_cmp(self):
-        self.failUnless(Task('t1', LOW) < Task('t2', MEDIUM))
-        self.failIf(Task('t1', LOW) > Task('t2', MEDIUM))
-        self.failUnless(Task('t1', HIGH) > Task('t2', MEDIUM))
-        self.failIf(Task('t1', HIGH) < Task('t2', MEDIUM))
+        self.assertTrue(Task('t1', LOW) < Task('t2', MEDIUM))
+        self.assertFalse(Task('t1', LOW) > Task('t2', MEDIUM))
+        self.assertTrue(Task('t1', HIGH) > Task('t2', MEDIUM))
+        self.assertFalse(Task('t1', HIGH) < Task('t2', MEDIUM))
 
 
 class PrioritizedTasksQueueTC(TestCase):
@@ -40,10 +40,10 @@ class PrioritizedTasksQueueTC(TestCase):
         queue.put(Task('t2', MEDIUM))
         queue.put(Task('t3', HIGH))
         queue.put(Task('t4', LOW))
-        self.assertEquals(queue.get().id, 't3')
-        self.assertEquals(queue.get().id, 't2')
-        self.assertEquals(queue.get().id, 't1')
-        self.assertEquals(queue.get().id, 't4')
+        self.assertEqual(queue.get().id, 't3')
+        self.assertEqual(queue.get().id, 't2')
+        self.assertEqual(queue.get().id, 't1')
+        self.assertEqual(queue.get().id, 't4')
 
     def test_remove_equivalent(self):
         queue = PrioritizedTasksQueue()
@@ -52,11 +52,11 @@ class PrioritizedTasksQueueTC(TestCase):
         queue.put(Task('t1', HIGH))
         queue.put(Task('t3', MEDIUM))
         queue.put(Task('t2', MEDIUM))
-        self.assertEquals(queue.qsize(), 3)
-        self.assertEquals(queue.get().id, 't1')
-        self.assertEquals(queue.get().id, 't2')
-        self.assertEquals(queue.get().id, 't3')
-        self.assertEquals(queue.qsize(), 0)
+        self.assertEqual(queue.qsize(), 3)
+        self.assertEqual(queue.get().id, 't1')
+        self.assertEqual(queue.get().id, 't2')
+        self.assertEqual(queue.get().id, 't3')
+        self.assertEqual(queue.qsize(), 0)
 
     def test_remove(self):
         queue = PrioritizedTasksQueue()
@@ -64,7 +64,7 @@ class PrioritizedTasksQueueTC(TestCase):
         queue.put(Task('t2'))
         queue.put(Task('t3'))
         queue.remove('t2')
-        self.assertEquals([t.id for t in queue], ['t3', 't1'])
+        self.assertEqual([t.id for t in queue], ['t3', 't1'])
         self.assertRaises(ValueError, queue.remove, 't4')
 
 if __name__ == '__main__':