apply_async of empty chain must return None. Closes celery#1650

ask · ask · commit af50b74fd3ad · 2013-11-15T13:47:31.000Z
diff --git a/celery/canvas.py b/celery/canvas.py
@@ -209,12 +209,16 @@ def set_immutable(self, immutable):
         self.immutable = immutable
 
     def apply_async(self, args=(), kwargs={}, **options):
+        try:
+            _apply = self._apply_async
+        except IndexError:  # no tasks for chain, etc to find type
+            return
         # For callbacks: extra args are prepended to the stored args.
         if args or kwargs or options:
             args, kwargs, options = self._merge(args, kwargs, options)
         else:
             args, kwargs, options = self.args, self.kwargs, self.options
-        return self._apply_async(args, kwargs, **options)
+        return _apply(args, kwargs, **options)
 
     def append_to_list_option(self, key, value):
         items = self.options.setdefault(key, [])
diff --git a/celery/tests/tasks/test_canvas.py b/celery/tests/tasks/test_canvas.py
@@ -220,6 +220,10 @@ def test_apply(self):
         self.assertEqual(res.parent.parent.get(), 8)
         self.assertIsNone(res.parent.parent.parent)
 
+    def test_empty_chain_returns_none(self):
+        self.assertIsNone(chain(app=self.app)())
+        self.assertIsNone(chain(app=self.app).apply_async())
+
     def test_call_no_tasks(self):
         x = chain()
         self.assertFalse(x())
