Tests passing

celery/tests/events/test_state.py

@@ -119,6 +119,8 @@ class test_Task(Case):
                     exception=1,
                     received=time() - 10,
                     started=time() - 8,
+                    exchange='celery',
+                    routing_key='celery',
                     succeeded=time())
         self.assertEqual(sorted(list(task._info_fields)),
                               sorted(task.info().keys()))

celery/tests/worker/test_control.py

@@ -15,6 +15,7 @@ from celery.task import task
 from celery.utils import uuid
 from celery.utils.timer2 import Timer
 from celery.worker import WorkController as _WC
+from celery.worker import consumer
 from celery.worker import control
 from celery.worker import state
 from celery.worker.buckets import FastQueue
@@ -35,7 +36,7 @@ class WorkController(object):
     autoscaler = None
 
 
-class Consumer(object):
+class Consumer(consumer.Consumer):
 
     def __init__(self):
         self.ready_queue = FastQueue()
@@ -47,6 +48,7 @@ class Consumer(object):
         self.app = current_app
         self.event_dispatcher = Mock()
         self.controller = WorkController()
+        self.task_consumer = Mock()
 
         from celery.concurrency.base import BasePool
         self.pool = BasePool(10)