Cleanup

Author: dandavison

tests/test_serialization_context.py

@@ -1129,8 +1129,6 @@ async def run(self, data: str) -> str:
 
 async def test_codec_with_context(client: Client):
     workflow_id = str(uuid.uuid4())
-    task_queue = str(uuid.uuid4())
-
     client = Client(
         **{
             **client.config(),
@@ -1139,17 +1137,16 @@ async def test_codec_with_context(client: Client):
             ),
         }
     )
-
     async with Worker(
         client,
-        task_queue=task_queue,
+        task_queue=str(uuid.uuid4()),
         workflows=[CodecTestWorkflow],
-    ):
+    ) as worker:
         await client.execute_workflow(
             CodecTestWorkflow.run,
             "data",
             id=workflow_id,
-            task_queue=task_queue,
+            task_queue=worker.task_queue,
         )
     workflow_context = dataclasses.asdict(
         WorkflowSerializationContext(
@@ -1290,8 +1287,6 @@ async def run(self, data: TraceData) -> TraceData:
 
 async def test_child_workflow_codec_with_context(client: Client):
     workflow_id = str(uuid.uuid4())
-    task_queue = str(uuid.uuid4())
-
     client = Client(
         **{
             **client.config(),
@@ -1301,18 +1296,17 @@ async def test_child_workflow_codec_with_context(client: Client):
             ),
         }
     )
-
     async with Worker(
         client,
-        task_queue=task_queue,
+        task_queue=str(uuid.uuid4()),
         workflows=[ChildWorkflowCodecTestWorkflow, EchoWorkflow],
         workflow_runner=UnsandboxedWorkflowRunner(),
-    ):
+    ) as worker:
         await client.execute_workflow(
             ChildWorkflowCodecTestWorkflow.run,
             TraceData(),
             id=workflow_id,
-            task_queue=task_queue,
+            task_queue=worker.task_queue,
         )
 
     parent_workflow_context = dataclasses.asdict(
@@ -1510,9 +1504,6 @@ async def test_payload_encryption_with_context(
     "Encrypt" outbound payloads with a key using all available context fields, in order to demonstrate
     that the same context is available to decrypt inbound payloads.
     """
-    workflow_id = str(uuid.uuid4())
-    task_queue = str(uuid.uuid4())
-
     client = Client(
         **{
             **client.config(),
@@ -1522,19 +1513,18 @@ async def test_payload_encryption_with_context(
             ),
         }
     )
-
     async with Worker(
         client,
-        task_queue=task_queue,
+        task_queue=str(uuid.uuid4()),
         workflows=[PayloadEncryptionWorkflow, PayloadEncryptionChildWorkflow],
         activities=[payload_encryption_activity],
         nexus_service_handlers=[PayloadEncryptionServiceHandler()],
-    ):
+    ) as worker:
         wf_handle = await client.start_workflow(
             PayloadEncryptionWorkflow.run,
             "outbound",
-            id=workflow_id,
-            task_queue=task_queue,
+            id=str(uuid.uuid4()),
+            task_queue=worker.task_queue,
         )
         assert "inbound" == await wf_handle.query(
             PayloadEncryptionWorkflow.query, "outbound"
@@ -1672,9 +1662,7 @@ async def run(self, data: PydanticData) -> PydanticData:
 
 
 async def test_pydantic_converter_with_context(client: Client):
-    wf_id = str(uuid.uuid4())
-    task_queue = str(uuid.uuid4())
-
+    workflow_id = str(uuid.uuid4())
     client = Client(
         **{
             **client.config(),
@@ -1687,13 +1675,13 @@ async def test_pydantic_converter_with_context(client: Client):
 
     async with Worker(
         client,
-        task_queue=task_queue,
+        task_queue=str(uuid.uuid4()),
         workflows=[PydanticContextWorkflow],
-    ):
+    ) as worker:
         result = await client.execute_workflow(
             PydanticContextWorkflow.run,
             PydanticData(value="test"),
-            id=wf_id,
-            task_queue=task_queue,
+            id=workflow_id,
+            task_queue=worker.task_queue,
         )
-        assert f"wf_{wf_id}" in result.trace
+        assert f"wf_{workflow_id}" in result.trace