Chords broken in master. Closes #2297

celery/backends/base.py

@@ -350,7 +350,8 @@ class BaseBackend(object):
 
     def apply_chord(self, header, partial_args, group_id, body,
                     options={}, **kwargs):
-        result = header(*partial_args, task_id=group_id, **options or {})
+        options['task_id'] = group_id
+        result = header(*partial_args, **options or {})
         self.fallback_chord_unlock(group_id, body, **kwargs)
         return result
 

celery/backends/redis.py

@@ -190,7 +190,8 @@ class RedisBackend(KeyValueStoreBackend):
     def _new_chord_apply(self, header, partial_args, group_id, body,
                          result=None, options={}, **kwargs):
         # avoids saving the group in the redis db.
-        return header(*partial_args, task_id=group_id, **options or {})
+        options['task_id'] = group_id
+        return header(*partial_args, **options or {})
 
     def _new_chord_return(self, task, state, result, propagate=None,
                           PROPAGATE_STATES=states.PROPAGATE_STATES):