Przeglądaj źródła

one sec join in test

Ask Solem 12 lat temu
rodzic
commit
5a1c49b693

+ 1 - 0
celery/app/amqp.py

@@ -28,6 +28,7 @@ QUEUE_FORMAT = """
 . %(name)s exchange:%(exchange)s(%(exchange_type)s) binding:%(routing_key)s
 . %(name)s exchange:%(exchange)s(%(exchange_type)s) binding:%(routing_key)s
 """
 """
 
 
+
 class Queues(dict):
 class Queues(dict):
     """Queue name⇒ declaration mapping.
     """Queue name⇒ declaration mapping.
 
 

+ 1 - 0
celery/bin/celery.py

@@ -84,6 +84,7 @@ def load_extension_commands(namespace='celery.commands'):
         else:
         else:
             command(cls, name=ep.name)
             command(cls, name=ep.name)
 
 
+
 class Command(BaseCommand):
 class Command(BaseCommand):
     help = ''
     help = ''
     args = ''
     args = ''

+ 1 - 1
celery/contrib/migrate.py

@@ -11,7 +11,7 @@ from __future__ import with_statement
 
 
 import socket
 import socket
 
 
-from functools import partial, wraps
+from functools import partial
 from itertools import cycle, islice
 from itertools import cycle, islice
 
 
 from kombu import eventloop, Queue
 from kombu import eventloop, Queue

+ 1 - 1
celery/tests/worker/test_worker.py

@@ -476,7 +476,7 @@ class test_Consumer(Case):
         l.update_strategies()
         l.update_strategies()
         l.receive_message(m.decode(), m)
         l.receive_message(m.decode(), m)
         l.timer.stop()
         l.timer.stop()
-        l.timer.join()
+        l.timer.join(1)
 
 
         items = [entry[2] for entry in self.timer.queue]
         items = [entry[2] for entry in self.timer.queue]
         found = 0
         found = 0