Bug/parsing issues

azure/durable_functions/tasks/task_utilities.py

@@ -1,4 +1,5 @@
 import logging
+import json
 
 from ..models.history import HistoryEventType
 
@@ -16,11 +17,11 @@ def parse_history_event(directive_result):
         raise ValueError("EventType is not found in task object")
 
     if event_type == HistoryEventType.EventRaised:
-        return directive_result["Input"]
+        return json.loads(directive_result["Input"])
     if event_type == HistoryEventType.SubOrchestrationInstanceCreated:
-        return directive_result["Result"]
+        return json.loads(directive_result["Result"])
     if event_type == HistoryEventType.TaskCompleted:
-        return directive_result["Result"]
+        return json.loads(directive_result["Result"])
     return None
 
 

tests/orchestrator/test_sequential_orchestrator.py

@@ -53,7 +53,7 @@ def test_initial_orchestration_state():
 
 def test_tokyo_state():
     context_builder = ContextBuilder('test_simple_function')
-    add_hello_completed_events(context_builder, 0, 'Hello Tokyo!')
+    add_hello_completed_events(context_builder, 0, "\"Hello Tokyo!\"")
     result = get_orchestration_state_result(context_builder, generator_function)
     expected_state = base_expected_state()
     add_hello_action(expected_state, 'Tokyo')
@@ -77,8 +77,8 @@ def test_failed_tokyo_state():
 
 def test_tokyo_and_seattle_state():
     context_builder = ContextBuilder('test_simple_function')
-    add_hello_completed_events(context_builder, 0, 'Hello Tokyo!')
-    add_hello_completed_events(context_builder, 1, 'Hello Seattle!')
+    add_hello_completed_events(context_builder, 0, "\"Hello Tokyo!\"")
+    add_hello_completed_events(context_builder, 1, "\"Hello Seattle!\"")
     result = get_orchestration_state_result(context_builder, generator_function)
     expected_state = base_expected_state()
     add_hello_action(expected_state, 'Tokyo')
@@ -90,9 +90,9 @@ def test_tokyo_and_seattle_state():
 
 def test_tokyo_and_seattle_and_london_state():
     context_builder = ContextBuilder('test_simple_function')
-    add_hello_completed_events(context_builder, 0, 'Hello Tokyo!')
-    add_hello_completed_events(context_builder, 1, 'Hello Seattle!')
-    add_hello_completed_events(context_builder, 2, 'Hello London!')
+    add_hello_completed_events(context_builder, 0, "\"Hello Tokyo!\"")
+    add_hello_completed_events(context_builder, 1, "\"Hello Seattle!\"")
+    add_hello_completed_events(context_builder, 2, "\"Hello London!\"")
     result = get_orchestration_state_result(context_builder, generator_function)
     expected_state = base_expected_state(['Hello Tokyo!', 'Hello Seattle!', 'Hello London!'])
     add_hello_action(expected_state, 'Tokyo')

tests/orchestrator/test_sequential_orchestrator_with_retry.py

@@ -68,7 +68,7 @@ def test_initial_orchestration_state():
 
 def test_tokyo_state():
     context_builder = ContextBuilder('test_simple_function')
-    add_hello_completed_events(context_builder, 0, 'Hello Tokyo!')
+    add_hello_completed_events(context_builder, 0, "\"Hello Tokyo!\"")
     result = get_orchestration_state_result(context_builder, generator_function)
     expected_state = base_expected_state()
     add_hello_action(expected_state, 'Tokyo')
@@ -131,6 +131,21 @@ def test_failed_tokyo_with_failed_retry_timer_added():
     assert_orchestration_state_equals(expected, result)
 
 
+def test_successful_tokyo_with_failed_retry_timer_added():
+    failed_reason = 'Reasons'
+    failed_details = 'Stuff and Things'
+    context_builder = ContextBuilder('test_simple_function')
+    add_hello_failed_events(context_builder, 0, failed_reason, failed_details)
+    add_retry_timer_events(context_builder, 1)
+    add_hello_completed_events(context_builder, 2, "\"Hello Tokyo!\"")
+    result = get_orchestration_state_result(context_builder, generator_function)
+    expected_state = base_expected_state()
+    add_hello_action(expected_state, 'Tokyo')
+    add_hello_action(expected_state, 'Seattle')
+    expected = expected_state.to_json()
+    assert_orchestration_state_equals(expected, result)
+
+
 def test_failed_tokyo_hit_max_attempts():
     failed_reason = 'Reasons'
     failed_details = 'Stuff and Things'