Ask Solem 13 years ago
parent
commit
1ac160649b
3 changed files with 6 additions and 4 deletions
  1. 1 0
      celery/result.py
  2. 4 3
      celery/tests/test_bin/test_celeryd.py
  3. 1 1
      celery/utils/dispatch/signal.py

+ 1 - 0
celery/result.py

@@ -14,6 +14,7 @@ from __future__ import with_statement
 
 import time
 
+from collections import deque
 from copy import copy
 from itertools import imap
 

+ 4 - 3
celery/tests/test_bin/test_celeryd.py

@@ -121,6 +121,8 @@ class test_Worker(AppCase):
     def test_tasklist(self):
         celery = Celery(set_as_current=False)
         worker = celery.Worker()
+        self.assertTrue(worker.app.tasks)
+        self.assertTrue(worker.app.finalized)
         self.assertTrue(worker.tasklist(include_builtins=True))
         worker.tasklist(include_builtins=False)
 
@@ -300,10 +302,10 @@ class test_Worker(AppCase):
     def test_redirect_stdouts_already_handled(self):
         logging_setup = [False]
 
+        @signals.setup_logging.connect
         def on_logging_setup(**kwargs):
             logging_setup[0] = True
 
-        signals.setup_logging.connect(on_logging_setup)
         try:
             worker = self.Worker()
             worker.app.log.__class__._setup = False
@@ -367,11 +369,10 @@ class test_Worker(AppCase):
     def test_on_consumer_ready(self):
         worker_ready_sent = [False]
 
+        @signals.worker_ready.connect
         def on_worker_ready(**kwargs):
             worker_ready_sent[0] = True
 
-        signals.worker_ready.connect(on_worker_ready)
-
         self.Worker().on_consumer_ready(object())
         self.assertTrue(worker_ready_sent[0])
 

+ 1 - 1
celery/utils/dispatch/signal.py

@@ -83,7 +83,7 @@ class Signal(object):
 
                 if weak:
                     receiver = saferef.safe_ref(receiver,
-                                                on_delete=self._remove_receiver)
+                                    on_delete=self._remove_receiver)
 
                 for r_key, _ in self.receivers:
                     if r_key == lookup_key: