Tests for new Result.__iter__

celery/tests/tasks/test_result.py

@@ -381,7 +381,7 @@ class test_GroupResult(AppCase):
     def test_iterate_raises(self):
         ar = MockAsyncResultFailure(uuid())
         ts = GroupResult(uuid(), [ar])
-        it = iter(ts)
+        it = ts.iterate()
         with self.assertRaises(KeyError):
             next(it)
 
@@ -434,7 +434,7 @@ class test_GroupResult(AppCase):
         ar = MockAsyncResultSuccess(uuid())
         ar2 = MockAsyncResultSuccess(uuid())
         ts = GroupResult(uuid(), [ar, ar2])
-        it = iter(ts)
+        it = ts.iterate()
         self.assertEqual(next(it), 42)
         self.assertEqual(next(it), 42)
 
@@ -442,7 +442,7 @@ class test_GroupResult(AppCase):
         ar1 = EagerResult(uuid(), 42, states.SUCCESS)
         ar2 = EagerResult(uuid(), 42, states.SUCCESS)
         ts = GroupResult(uuid(), [ar1, ar2])
-        it = iter(ts)
+        it = ts.iterate()
         self.assertEqual(next(it), 42)
         self.assertEqual(next(it), 42)
 
@@ -454,11 +454,14 @@ class test_GroupResult(AppCase):
         with self.assertRaises(TimeoutError):
             ts.join(timeout=0.0000001)
 
-    def test___iter__(self):
-        it = iter(self.ts)
+    def test_iterate_simple(self):
+        it = self.ts.iterate()
         results = sorted(list(it))
         self.assertListEqual(results, list(range(self.size)))
 
+    def test___iter__(self):
+        self.assertListEqual(list(iter(self.ts)), self.ts.results)
+
     def test_join(self):
         joined = self.ts.join()
         self.assertListEqual(joined, list(range(self.size)))
@@ -501,8 +504,8 @@ class test_failed_AsyncResult(test_GroupResult):
     def test_completed_count(self):
         self.assertEqual(self.ts.completed_count(), len(self.ts) - 1)
 
-    def test___iter__(self):
-        it = iter(self.ts)
+    def test_iterate_simple(self):
+        it = self.ts.iterate()
 
         def consume():
             return list(it)

celery/tests/worker/test_worker.py

@@ -1113,14 +1113,14 @@ class test_WorkController(AppCase):
 
         from celery.concurrency.processes import TaskPool as _TaskPool
 
-        class TaskPool(_TaskPool):
+        class MockTaskPool(_TaskPool):
             Pool = PoolImp
 
             @property
             def timers(self):
                 return {Mock(): 30}
 
-        w.pool_cls = TaskPool
+        w.pool_cls = MockTaskPool
         w.use_eventloop = True
         w.consumer.restart_count = -1
         pool = components.Pool(w)