unittests: Replace assert*Equals -> assert*Equal, to conform with new unittest2 conventions.

celery/tests/test_task.py

@@ -233,7 +233,7 @@ class TestCeleryTasks(unittest.TestCase):
                                                 for x in xrange(10)))
         conf.ALWAYS_EAGER = False
 
-    def assertNextTaskDataEquals(self, consumer, presult, task_name,
+    def assertNextTaskDataEqual(self, consumer, presult, task_name,
             test_eta=False, **kwargs):
         next_task = consumer.fetch()
         task_data = next_task.decode()
@@ -275,28 +275,28 @@ class TestCeleryTasks(unittest.TestCase):
 
         # Without arguments.
         presult = t1.delay()
-        self.assertNextTaskDataEquals(consumer, presult, t1.name)
+        self.assertNextTaskDataEqual(consumer, presult, t1.name)
 
         # With arguments.
         presult2 = t1.apply_async(kwargs=dict(name="George Constanza"))
-        self.assertNextTaskDataEquals(consumer, presult2, t1.name,
+        self.assertNextTaskDataEqual(consumer, presult2, t1.name,
                 name="George Constanza")
 
         # send_task
         sresult = send_task(t1.name, kwargs=dict(name="Elaine M. Benes"))
-        self.assertNextTaskDataEquals(consumer, sresult, t1.name,
+        self.assertNextTaskDataEqual(consumer, sresult, t1.name,
                 name="Elaine M. Benes")
 
         # With eta.
         presult2 = task.apply_async(t1, kwargs=dict(name="George Constanza"),
                                     eta=datetime.now() + timedelta(days=1))
-        self.assertNextTaskDataEquals(consumer, presult2, t1.name,
+        self.assertNextTaskDataEqual(consumer, presult2, t1.name,
                 name="George Constanza", test_eta=True)
 
         # With countdown.
         presult2 = task.apply_async(t1, kwargs=dict(name="George Constanza"),
                                     countdown=10)
-        self.assertNextTaskDataEquals(consumer, presult2, t1.name,
+        self.assertNextTaskDataEqual(consumer, presult2, t1.name,
                 name="George Constanza", test_eta=True)
 
         # Discarding all tasks.

celery/tests/test_views.py

@@ -46,7 +46,7 @@ def catch_exception(exception):
 
 class ViewTestCase(DjangoTestCase):
 
-    def assertJSONEquals(self, json, py):
+    def assertJSONEqual(self, json, py):
         json = isinstance(json, HttpResponse) and json.content or json
         try:
             self.assertEqual(JSON_load(json), py)
@@ -91,7 +91,7 @@ class TestTaskStatus(ViewTestCase):
             expect["exc"] = get_full_cls_name(res.__class__)
             expect["traceback"] = traceback
 
-        self.assertJSONEquals(json, dict(task=expect))
+        self.assertJSONEqual(json, dict(task=expect))
 
     def test_task_status_success(self):
         self.assertStatusForIs(states.SUCCESS, "The quick brown fox")
@@ -113,8 +113,8 @@ class TestTaskIsSuccessful(ViewTestCase):
         result = gen_unique_id()
         default_backend.store_result(uuid, result, status)
         json = self.client.get(task_is_successful(task_id=uuid))
-        self.assertJSONEquals(json, {"task": {"id": uuid,
-                                              "executed": outcome}})
+        self.assertJSONEqual(json, {"task": {"id": uuid,
+                                             "executed": outcome}})
 
     def test_is_successful_success(self):
         self.assertStatusForIs(states.SUCCESS, True)

celery/tests/test_worker_job.py

@@ -97,7 +97,7 @@ class TestJail(unittest.TestCase):
         task_id = gen_unique_id()
         ret = jail(id, MyTaskIgnoreResult.name,
                    [4], {})
-        self.assertEquals(ret, 256)
+        self.assertEqual(ret, 256)
         self.assertFalse(AsyncResult(task_id).ready())
 
     def test_django_db_connection_is_closed(self):
@@ -370,7 +370,7 @@ class TestTaskWrapper(unittest.TestCase):
         p = TaskPool(2)
         p.start()
         asyncres = tw.execute_using_pool(p)
-        self.assertEquals(asyncres.get(), 256)
+        self.assertEqual(asyncres.get(), 256)
         p.stop()
 
     def test_default_kwargs(self):