Only convert eta to isoformat when it is not already a string (celery#4565)

* Fixed celery#4560.

* Added a test.

* Remove fake now...

Author: Omer Katz

celery/app/amqp.py

@@ -328,7 +328,8 @@ def as_task_v2(self, task_id, name, args=None, kwargs=None,
             expires = maybe_make_aware(
                 now + timedelta(seconds=expires), tz=timezone,
             )
-        eta = eta and eta.isoformat()
+        if not isinstance(eta, string_t):
+            eta = eta and eta.isoformat()
         # If we retry a task `expires` will already be ISO8601-formatted.
         if not isinstance(expires, string_t):
             expires = expires and expires.isoformat()

t/integration/test_canvas.py

@@ -165,7 +165,6 @@ def test_chord_soft_timeout_recuperation(self, manager):
         result = c(delayed_sum.s(pause_time=0)).get()
         assert result == 3
 
-    @pytest.mark.xfail()
     def test_chain_error_handler_with_eta(self, manager):
         try:
             manager.app.backend.ensure_chords_allowed()

t/unit/app/test_amqp.py

@@ -359,6 +359,13 @@ def test_expires_to_datetime(self):
         assert m.headers['expires'] == (
             now + timedelta(seconds=30)).isoformat()
 
+    def test_eta_to_datetime(self):
+        eta = datetime.utcnow()
+        m = self.app.amqp.as_task_v2(
+            uuid(), 'foo', eta=eta,
+        )
+        assert m.headers['eta'] == eta.isoformat()
+
     def test_callbacks_errbacks_chord(self):
 
         @self.app.task