fix integration test

Signed-off-by: Tim Li <ltim@uber.com>

Author: timl3136

tests/cadence/_internal/activity/test_activity_executor.py

@@ -358,8 +358,9 @@ def activity_fn():
     executor = ActivityExecutor(client, "task_list", "identity", 1, reg.get_activity)
 
     await executor.execute(fake_task("activity_type", ""))
-    # Allow the event loop to process the heartbeat scheduled from the thread
-    await asyncio.sleep(0)
+    # run_coroutine_threadsafe schedules the heartbeat from a thread;
+    # the coroutine needs multiple event-loop iterations to complete.
+    await asyncio.sleep(0.1)
 
     worker_stub.RespondActivityTaskCompleted.assert_called_once()
     worker_stub.RecordActivityTaskHeartbeat.assert_called_once_with(

tests/integration_tests/workflow/test_heartbeat.py

@@ -84,12 +84,23 @@ async def test_activity_without_heartbeat_times_out(helper: CadenceHelper):
             execution_start_to_close_timeout=timedelta(seconds=30),
         )
 
+        # Wait for the workflow to close (activity timeout will cause workflow failure)
+        await worker.client.workflow_stub.GetWorkflowExecutionHistory(
+            GetWorkflowExecutionHistoryRequest(
+                domain=DOMAIN_NAME,
+                workflow_execution=execution,
+                wait_for_new_event=True,
+                history_event_filter_type=EventFilterType.EVENT_FILTER_TYPE_CLOSE_EVENT,
+                skip_archival=True,
+            )
+        )
+
+        # Fetch the full history to verify the activity timed out due to missing heartbeat
         response: GetWorkflowExecutionHistoryResponse = (
             await worker.client.workflow_stub.GetWorkflowExecutionHistory(
                 GetWorkflowExecutionHistoryRequest(
                     domain=DOMAIN_NAME,
                     workflow_execution=execution,
-                    wait_for_new_event=True,
                     skip_archival=True,
                 )
             )