Browse Source

Don't use deprecated TestCase.assertEquals

Ask Solem 11 years ago
parent
commit
b9b53f311f

+ 1 - 1
celery/tests/backends/test_couchbase.py

@@ -50,7 +50,7 @@ class test_CouchBaseBackend(AppCase):
 
             connection = self.backend._get_connection()
 
-            self.assertEquals(sentinel._connection, connection)
+            self.assertEqual(sentinel._connection, connection)
             self.assertFalse(mock_Connection.called)
 
     def test_get(self):

+ 10 - 10
celery/tests/backends/test_mongodb.py

@@ -84,7 +84,7 @@ class test_MongoBackend(AppCase):
 
             connection = self.backend._get_connection()
 
-            self.assertEquals(sentinel._connection, connection)
+            self.assertEqual(sentinel._connection, connection)
             self.assertFalse(mock_Connection.called)
 
     def test_get_connection_no_connection_host(self):
@@ -98,7 +98,7 @@ class test_MongoBackend(AppCase):
             connection = self.backend._get_connection()
             mock_Connection.assert_called_once_with(
                 MONGODB_HOST, MONGODB_PORT, ssl=False, max_pool_size=10)
-            self.assertEquals(sentinel.connection, connection)
+            self.assertEqual(sentinel.connection, connection)
 
     def test_get_connection_no_connection_mongodb_uri(self):
 
@@ -112,7 +112,7 @@ class test_MongoBackend(AppCase):
             connection = self.backend._get_connection()
             mock_Connection.assert_called_once_with(
                 mongodb_uri, ssl=False, max_pool_size=10)
-            self.assertEquals(sentinel.connection, connection)
+            self.assertEqual(sentinel.connection, connection)
 
     @patch('celery.backends.mongodb.MongoBackend._get_connection')
     def test_get_database_no_existing(self, mock_get_connection):
@@ -152,11 +152,11 @@ class test_MongoBackend(AppCase):
     def test_process_cleanup(self):
         self.backend._connection = None
         self.backend.process_cleanup()
-        self.assertEquals(self.backend._connection, None)
+        self.assertEqual(self.backend._connection, None)
 
         self.backend._connection = 'not none'
         self.backend.process_cleanup()
-        self.assertEquals(self.backend._connection, None)
+        self.assertEqual(self.backend._connection, None)
 
     @patch('celery.backends.mongodb.MongoBackend._get_database')
     def test_store_result(self, mock_get_database):
@@ -174,7 +174,7 @@ class test_MongoBackend(AppCase):
         mock_get_database.assert_called_once_with()
         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
         mock_collection.save.assert_called_once()
-        self.assertEquals(sentinel.result, ret_val)
+        self.assertEqual(sentinel.result, ret_val)
 
     @patch('celery.backends.mongodb.MongoBackend._get_database')
     def test_get_task_meta_for(self, mock_get_database):
@@ -192,7 +192,7 @@ class test_MongoBackend(AppCase):
 
         mock_get_database.assert_called_once_with()
         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
-        self.assertEquals(
+        self.assertEqual(
             ['status', 'task_id', 'date_done', 'traceback', 'result',
              'children'],
             list(ret_val.keys()))
@@ -212,7 +212,7 @@ class test_MongoBackend(AppCase):
 
         mock_get_database.assert_called_once_with()
         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
-        self.assertEquals({'status': states.PENDING, 'result': None}, ret_val)
+        self.assertEqual({'status': states.PENDING, 'result': None}, ret_val)
 
     @patch('celery.backends.mongodb.MongoBackend._get_database')
     def test_save_group(self, mock_get_database):
@@ -230,7 +230,7 @@ class test_MongoBackend(AppCase):
         mock_get_database.assert_called_once_with()
         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
         mock_collection.save.assert_called_once()
-        self.assertEquals(sentinel.result, ret_val)
+        self.assertEqual(sentinel.result, ret_val)
 
     @patch('celery.backends.mongodb.MongoBackend._get_database')
     def test_restore_group(self, mock_get_database):
@@ -249,7 +249,7 @@ class test_MongoBackend(AppCase):
         mock_database.__getitem__.assert_called_once_with(MONGODB_COLLECTION)
         mock_collection.find_one.assert_called_once_with(
             {'_id': sentinel.taskset_id})
-        self.assertEquals(
+        self.assertEqual(
             ['date_done', 'result', 'task_id'],
             list(ret_val.keys()),
         )

+ 2 - 2
celery/tests/worker/test_request.py

@@ -818,8 +818,8 @@ class test_Request(AppCase):
                     content_encoding='utf-8')
         job = TaskRequest.from_message(m, m.decode(), app=self.app)
         self.assertIsInstance(job, Request)
-        self.assertEquals(job.args, [])
-        self.assertEquals(job.kwargs, {})
+        self.assertEqual(job.args, [])
+        self.assertEqual(job.kwargs, {})
 
     def test_from_message_missing_required_fields(self):
         body = {}

+ 1 - 1
docs/django/unit-testing.rst

@@ -48,7 +48,7 @@ Then we can put the tests in a ``tests.py`` somewhere:
             and returns the correct result."""
             result = add.delay(8, 8)
 
-            self.assertEquals(result.get(), 16)
+            self.assertEqual(result.get(), 16)
             self.assertTrue(result.successful())