Ask Solem преди 9 години
родител
ревизия
984d218f82
променени са 5 файла, в които са добавени 4 реда и са изтрити 9 реда
  1. 1 1
      celery/result.py
  2. 0 2
      celery/tests/app/test_control.py
  3. 1 3
      celery/tests/backends/test_amqp.py
  4. 0 1
      celery/tests/utils/test_objects.py
  5. 2 2
      celery/tests/worker/test_consumer.py

+ 1 - 1
celery/result.py

@@ -14,7 +14,7 @@ from collections import OrderedDict, deque
 from contextlib import contextmanager
 from copy import copy
 
-from amqp.promise import Thenable, barrier, promise
+from amqp.promise import Thenable, promise
 from kombu.utils import cached_property
 
 from . import current_app

+ 0 - 2
celery/tests/app/test_control.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-import warnings
-
 from functools import wraps
 
 from kombu.pidbox import Mailbox

+ 1 - 3
celery/tests/backends/test_amqp.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import pickle
-import socket
 
 from contextlib import contextmanager
 from datetime import timedelta
@@ -11,13 +10,12 @@ from billiard.einfo import ExceptionInfo
 
 from celery import states
 from celery.backends.amqp import AMQPBackend
-from celery.exceptions import TimeoutError
 from celery.five import Empty, Queue, range
 from celery.result import AsyncResult
 from celery.utils import uuid
 
 from celery.tests.case import (
-    AppCase, Mock, depends_on_current_app, patch, sleepdeprived,
+    AppCase, Mock, depends_on_current_app, sleepdeprived,
 )
 
 

+ 0 - 1
celery/tests/utils/test_objects.py

@@ -11,4 +11,3 @@ class test_Bunch(Case):
         x = Bunch(foo='foo', bar=2)
         self.assertEqual(x.foo, 'foo')
         self.assertEqual(x.bar, 2)
-

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

@@ -178,12 +178,12 @@ class test_Consumer(AppCase):
         c.register_with_event_loop(Mock(name='loop'))
 
     def test_on_close_clears_semaphore_timer_and_reqs(self):
-        with patch('celery.worker.consumer.consumer.reserved_requests') as reserv:
+        with patch('celery.worker.consumer.consumer.reserved_requests') as res:
             c = self.get_consumer()
             c.on_close()
             c.controller.semaphore.clear.assert_called_with()
             c.timer.clear.assert_called_with()
-            reserv.clear.assert_called_with()
+            res.clear.assert_called_with()
             c.pool.flush.assert_called_with()
 
             c.controller = None