Pārlūkot izejas kodu

Don't use deprecated assertItemsEqual

Ask Solem 13 gadi atpakaļ
vecāks
revīzija
e7dbb2b54c

+ 2 - 2
celery/tests/test_app/test_loaders.py

@@ -103,8 +103,8 @@ class TestLoaderBase(unittest.TestCase):
         self.assertEqual(self.loader.conf["foo"], "bar")
 
     def test_import_default_modules(self):
-        self.assertItemsEqual(self.loader.import_default_modules(),
-                              [os, sys, task])
+        self.assertEqual(sorted(self.loader.import_default_modules()),
+                         sorted([os, sys, task]))
 
     def test_import_from_cwd_custom_imp(self):
 

+ 2 - 2
celery/tests/test_backends/test_amqp.py

@@ -225,10 +225,10 @@ class test_AMQPBackend(unittest.TestCase):
                                     "traceback": None,
                                     "task_id": uuid})
                                 for i, uuid in enumerate(uuids)]
-        self.assertItemsEqual(res, expected_results)
+        self.assertEqual(sorted(res), sorted(expected_results))
         self.assertDictEqual(b._cache[res[0][0]], res[0][1])
         cached_res = list(b.get_many(uuids, timeout=1))
-        self.assertItemsEqual(cached_res, expected_results)
+        self.assertEqual(sorted(cached_res), sorted(expected_results))
         b._cache[res[0][0]]["status"] = states.RETRY
         self.assertRaises(socket.timeout, list,
                           b.get_many(uuids, timeout=0.01))

+ 7 - 7
celery/tests/test_events/test_events_state.py

@@ -105,14 +105,14 @@ class test_Task(unittest.TestCase):
                     received=time() - 10,
                     started=time() - 8,
                     succeeded=time())
-        self.assertItemsEqual(list(task._info_fields),
-                              task.info().keys())
+        self.assertEqual(sorted(list(task._info_fields)),
+                              sorted(task.info().keys()))
 
-        self.assertItemsEqual(list(task._info_fields + ("received", )),
-                              task.info(extra=("received", )))
+        self.assertEqual(sorted(list(task._info_fields + ("received", ))),
+                              sorted(task.info(extra=("received", ))))
 
-        self.assertItemsEqual(["args", "kwargs"],
-                              task.info(["args", "kwargs"]).keys())
+        self.assertEqual(sorted(["args", "kwargs"]),
+                         sorted(task.info(["args", "kwargs"]).keys()))
 
     def test_ready(self):
         task = Task(uuid="abcdefg",
@@ -278,7 +278,7 @@ class test_State(unittest.TestCase):
     def test_task_types(self):
         r = ev_snapshot(State())
         r.play()
-        self.assertItemsEqual(r.state.task_types(), ["task1", "task2"])
+        self.assertEqual(sorted(r.state.task_types()), ["task1", "task2"])
 
     def test_tasks_by_timestamp(self):
         r = ev_snapshot(State())

+ 1 - 1
celery/tests/test_slow/test_buckets.py

@@ -278,7 +278,7 @@ class test_TaskBucket(unittest.TestCase):
         x.buckets[TaskA.name].put(1)
         x.buckets[TaskB.name].put(2)
         x.buckets[TaskC.name].put(3)
-        self.assertItemsEqual(x.items, [1, 2, 3])
+        self.assertEqual(sorted(x.items), [1, 2, 3])
 
 
 class test_FastQueue(unittest.TestCase):

+ 2 - 2
celery/tests/test_utils/test_utils_info.py

@@ -39,5 +39,5 @@ class TestInfo(unittest.TestCase):
     def test_format_queues(self):
         celery = Celery(set_as_current=False)
         celery.amqp.queues = celery.amqp.Queues(QUEUES)
-        self.assertItemsEqual(celery.amqp.queues.format().split("\n"),
-                              [QUEUE_FORMAT1, QUEUE_FORMAT2])
+        self.assertEqual(sorted(celery.amqp.queues.format().split("\n")),
+                         sorted([QUEUE_FORMAT1, QUEUE_FORMAT2]))

+ 2 - 2
celery/tests/test_worker/test_worker_control.py

@@ -216,8 +216,8 @@ class test_ControlPanel(unittest.TestCase):
         state.revoked.add("a2")
 
         try:
-            self.assertItemsEqual(self.panel.handle("dump_revoked"),
-                                  ["a1", "a2"])
+            self.assertEqual(sorted(self.panel.handle("dump_revoked")),
+                             ["a1", "a2"])
         finally:
             state.revoked.clear()