Tests passing

celery/tests/bin/test_worker.py

@@ -71,7 +71,6 @@ class test_Worker(WorkerAppCase):
     def test_queues_string(self):
         w = self.app.Worker()
         w.setup_queues('foo,bar,baz')
-        self.assertEqual(w.queues, ['foo', 'bar', 'baz'])
         self.assertTrue('foo' in self.app.amqp.queues)
 
     @disable_stdouts
@@ -242,7 +241,7 @@ class test_Worker(WorkerAppCase):
         del(app.amqp.queues)
         c.CELERY_CREATE_MISSING_QUEUES = True
         worker = self.Worker(app=self.app)
-        worker.setup_queues(queues=['image'])
+        worker.setup_queues(['image'])
         self.assertIn('image', app.amqp.queues.consume_from)
         self.assertEqual(
             Queue('image', Exchange('image'), routing_key='image'),

celery/tests/worker/test_loops.py

@@ -139,7 +139,9 @@ class test_asynloop(AppCase):
     def test_on_task_received(self):
         _, on_task, body, msg, strategy = self.task_context(self.add.s(2, 2))
         on_task(body, msg)
-        strategy.assert_called_with(msg, body, msg.ack_log_error)
+        strategy.assert_called_with(
+            msg, body, msg.ack_log_error, msg.reject_log_error,
+        )
 
     def test_on_task_received_executes_on_task_message(self):
         cbs = [Mock(), Mock(), Mock()]

celery/tests/worker/test_request.py

@@ -944,6 +944,7 @@ class test_Request(AppCase):
                     'exchange': None,
                     'routing_key': None,
                     'priority': None,
+                    'redelivered': None,
                 },
                 'task_name': job.name})
 

celery/tests/worker/test_strategy.py

@@ -32,7 +32,10 @@ class test_default_strategy(AppCase):
             self.body = body
 
         def __call__(self, **kwargs):
-            return self.s(self.message, self.body, self.message.ack, **kwargs)
+            return self.s(
+                self.message, self.body,
+                self.message.ack, self.message.reject, **kwargs
+            )
 
         def was_reserved(self):
             return self.reserved.called

celery/tests/worker/test_worker.py

@@ -504,7 +504,7 @@ class test_Consumer(AppCase):
         with self.assertRaises(Empty):
             self.buffer.get_nowait()
         self.assertTrue(self.timer.empty())
-        m.reject.assert_called_with()
+        m.reject.assert_called_with(requeue=False)
         self.assertTrue(logger.critical.call_count)
 
     def test_receive_message_eta(self):

celery/worker/__init__.py

@@ -168,7 +168,7 @@ class WorkController(object):
         if self.pidlock:
             self.pidlock.release()
 
-    def setup_queues(self, include, exclude):
+    def setup_queues(self, include, exclude=None):
         include = str_to_list(include)
         exclude = str_to_list(exclude)
         try: