From 002683fd13c74028912f934408c0376b410bd487 Mon Sep 17 00:00:00 2001
From: Laurie O <laurie_opperman@hotmail.com>
Date: Wed, 26 Feb 2020 00:19:39 +1000
Subject: [PATCH] Return empty task-token on no-task

To match the SWF documentation, an empty task is one where the
task-token is the empty string, rather than being a nonexistant key

Signed-off-by: Laurie O <laurie_opperman@hotmail.com>
---
 moto/swf/responses.py                           | 6 ++++--
 tests/test_swf/responses/test_activity_tasks.py | 4 ++--
 tests/test_swf/responses/test_decision_tasks.py | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/moto/swf/responses.py b/moto/swf/responses.py
index 2b7794ffd..c8c601fa7 100644
--- a/moto/swf/responses.py
+++ b/moto/swf/responses.py
@@ -423,7 +423,9 @@ class SWFResponse(BaseResponse):
         if decision:
             return json.dumps(decision.to_full_dict(reverse_order=reverse_order))
         else:
-            return json.dumps({"previousStartedEventId": 0, "startedEventId": 0})
+            return json.dumps(
+                {"previousStartedEventId": 0, "startedEventId": 0, "taskToken": ""}
+            )
 
     def count_pending_decision_tasks(self):
         domain_name = self._params["domain"]
@@ -457,7 +459,7 @@ class SWFResponse(BaseResponse):
         if activity_task:
             return json.dumps(activity_task.to_full_dict())
         else:
-            return json.dumps({"startedEventId": 0})
+            return json.dumps({"startedEventId": 0, "taskToken": ""})
 
     def count_pending_activity_tasks(self):
         domain_name = self._params["domain"]
diff --git a/tests/test_swf/responses/test_activity_tasks.py b/tests/test_swf/responses/test_activity_tasks.py
index 0b72b7ca7..4fa965b11 100644
--- a/tests/test_swf/responses/test_activity_tasks.py
+++ b/tests/test_swf/responses/test_activity_tasks.py
@@ -35,14 +35,14 @@ def test_poll_for_activity_task_when_one():
 def test_poll_for_activity_task_when_none():
     conn = setup_workflow()
     resp = conn.poll_for_activity_task("test-domain", "activity-task-list")
-    resp.should.equal({"startedEventId": 0})
+    resp.should.equal({"startedEventId": 0, "taskToken": ""})
 
 
 @mock_swf_deprecated
 def test_poll_for_activity_task_on_non_existent_queue():
     conn = setup_workflow()
     resp = conn.poll_for_activity_task("test-domain", "non-existent-queue")
-    resp.should.equal({"startedEventId": 0})
+    resp.should.equal({"startedEventId": 0, "taskToken": ""})
 
 
 # CountPendingActivityTasks endpoint
diff --git a/tests/test_swf/responses/test_decision_tasks.py b/tests/test_swf/responses/test_decision_tasks.py
index 6389536e6..bdf690ce0 100644
--- a/tests/test_swf/responses/test_decision_tasks.py
+++ b/tests/test_swf/responses/test_decision_tasks.py
@@ -38,14 +38,18 @@ def test_poll_for_decision_task_when_none():
     resp = conn.poll_for_decision_task("test-domain", "queue")
     # this is the DecisionTask representation you get from the real SWF
     # after waiting 60s when there's no decision to be taken
-    resp.should.equal({"previousStartedEventId": 0, "startedEventId": 0})
+    resp.should.equal(
+        {"previousStartedEventId": 0, "startedEventId": 0, "taskToken": ""}
+    )
 
 
 @mock_swf_deprecated
 def test_poll_for_decision_task_on_non_existent_queue():
     conn = setup_workflow()
     resp = conn.poll_for_decision_task("test-domain", "non-existent-queue")
-    resp.should.equal({"previousStartedEventId": 0, "startedEventId": 0})
+    resp.should.equal(
+        {"previousStartedEventId": 0, "startedEventId": 0, "taskToken": ""}
+    )
 
 
 @mock_swf_deprecated