Bläddra i källkod

Tests now passing without a running broker. Using the in-memory backend.

Closes #57
Ask Solem 14 år sedan
förälder
incheckning
347bc2b808

+ 0 - 0
celery/tests/test_backends/test_amqp.py → celery/tests/test_backends/disabled_amqp.py


+ 1 - 2
celery/tests/test_events.py

@@ -33,8 +33,7 @@ class TestEventDispatcher(unittest.TestCase):
 
     def test_send(self):
         publisher = MockPublisher()
-        eventer = events.EventDispatcher(object(), publisher=publisher)
-
+        eventer = events.EventDispatcher(object(), enabled=False)
         eventer.publisher = publisher
         eventer.enabled = True
         eventer.send("World War II", ended=True)

+ 8 - 2
celery/tests/test_worker_controllers.py

@@ -5,6 +5,7 @@ from Queue import Queue
 from celery.utils import gen_unique_id
 from celery.worker.controllers import Mediator
 from celery.worker.controllers import BackgroundThread, ScheduleController
+from celery.worker.revoke import revoked as revoked_tasks
 
 
 class MockTask(object):
@@ -18,6 +19,12 @@ class MockTask(object):
     def on_ack(self):
         self.acked = True
 
+    def revoked(self):
+        if self.task_id in revoked_tasks:
+            self.on_ack()
+            return True
+        return False
+
 
 class MyBackgroundThread(BackgroundThread):
 
@@ -84,8 +91,7 @@ class TestMediator(unittest.TestCase):
         m = Mediator(ready_queue, mycallback)
         t = MockTask("Jerry Seinfeld")
         t.task_id = gen_unique_id()
-        from celery.worker.revoke import revoked
-        revoked.add(t.task_id)
+        revoked_tasks.add(t.task_id)
         ready_queue.put(t)
 
         m.on_iteration()

+ 4 - 0
celery/tests/test_worker_scheduler.py

@@ -8,10 +8,14 @@ from celery.worker.scheduler import Scheduler
 
 
 class MockItem(object):
+    is_revoked = False
 
     def __init__(self, value):
         self.task_id = value
 
+    def revoked(self):
+        return self.is_revoked
+
 
 class TestScheduler(unittest.TestCase):
 

+ 1 - 0
tests/celeryconfig.py

@@ -5,6 +5,7 @@ BROKER_PORT = 5672
 BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
+CARROT_BACKEND = "memory"
 
 CELERY_RESULT_BACKEND = "database"
 CELERY_RESULT_DBURI = "sqlite:///test.db"