Merge branch 'OddBloke/master'

celery/tests/test_worker/test_worker.py

@@ -513,6 +513,12 @@ class test_Consumer(unittest.TestCase):
         self.assertTrue(init_callback.call_count)
         self.assertTrue(l.consume_messages.call_count)
 
+    def test_reset_connection_with_no_node(self):
+
+        l = MainConsumer(self.ready_queue, self.eta_schedule, self.logger)
+        self.assertEqual(None, l.pool)
+        l.reset_connection()
+
 
 class test_WorkController(AppCase):
 

celery/worker/consumer.py

@@ -497,7 +497,7 @@ class Consumer(object):
             except self.connection_errors + self.channel_errors:
                 pass
 
-        if self.pool.is_green:
+        if self.pool is not None and self.pool.is_green:
             return self.pool.spawn_n(self._green_pidbox_node)
         self.pidbox_node.channel = self.connection.channel()
         self.broadcast_consumer = self.pidbox_node.listen(