Cleanup

Author: dandavison

tests/nexus/test_workflow_caller_cancellation_types.py

@@ -16,7 +16,6 @@
 )
 from temporalio.testing import WorkflowEnvironment
 from temporalio.worker import Worker
-from tests.helpers import assert_eq_eventually, print_interleaved_histories
 from tests.helpers.nexus import create_nexus_endpoint, make_nexus_endpoint_name
 
 
@@ -93,9 +92,6 @@ async def check_behavior_for_abandon(
     Check that a cancellation request is not sent.
     """
     await asyncio.sleep(0.5)
-
-    await print_interleaved_histories(caller_wf, handler_wf)
-
     handler_status = (await handler_wf.describe()).status
     assert handler_status == WorkflowExecutionStatus.RUNNING
     await _assert_event_subsequence(
@@ -144,7 +140,6 @@ async def check_behavior_for_wait_cancellation_completed(
     """
     handler_status = (await handler_wf.describe()).status
     assert handler_status == WorkflowExecutionStatus.CANCELED
-    await print_interleaved_histories(caller_wf, handler_wf)
     await _assert_event_subsequence(
         [
             (caller_wf, EventType.EVENT_TYPE_WORKFLOW_EXECUTION_STARTED),
@@ -198,9 +193,11 @@ async def test_cancellation_type(
             task_queue=worker.task_queue,
         )
         operation_token = (await caller_wf.result()).operation_token
-        handler_wf = nexus.WorkflowHandle.from_token(
-            operation_token
-        )._to_client_workflow_handle(client)
+        handler_wf = (
+            nexus.WorkflowHandle[None]
+            .from_token(operation_token)
+            ._to_client_workflow_handle(client)
+        )
 
         if input.cancellation_type == workflow.NexusOperationCancellationType.ABANDON:
             await check_behavior_for_abandon(caller_wf, handler_wf)
@@ -258,9 +255,3 @@ def _event_time(
             ),
             None,
         ), f"Expected {expected_event_type_name} in {expected_handle.id}"
-
-
-async def _assert_has_event_eventually(
-    wf_handle: WorkflowHandle, event_type: EventType.ValueType
-) -> None:
-    await assert_eq_eventually(True, lambda: _has_event(wf_handle, event_type))