Fix test and merge artifact

Author: tconley1428

temporalio/worker/_workflow_instance.py

@@ -2780,14 +2780,10 @@ def _apply_schedule_command(
             v.start_to_close_timeout.FromTimedelta(self._input.start_to_close_timeout)
         if self._input.retry_policy:
             self._input.retry_policy.apply_to_proto(v.retry_policy)
-<<<<<<< Updated upstream
-=======
-        print("Input summary:", self._input.summary)
         if self._input.summary:
             command.user_metadata.summary.CopyFrom(
                 self._instance._payload_converter.to_payload(self._input.summary)
             )
->>>>>>> Stashed changes
         v.cancellation_type = cast(
             temporalio.bridge.proto.workflow_commands.ActivityCancellationType.ValueType,
             int(self._input.cancellation_type),
@@ -2809,10 +2805,6 @@ def _apply_schedule_command(
                 command.schedule_activity.versioning_intent = (
                     self._input.versioning_intent._to_proto()
                 )
-            if self._input.summary:
-                command.user_metadata.summary.CopyFrom(
-                    self._instance._payload_converter.to_payload(self._input.summary)
-                )
             if self._input.priority:
                 command.schedule_activity.priority.CopyFrom(
                     self._input.priority._to_proto()

tests/test_client.py

@@ -4,7 +4,7 @@
 import os
 import uuid
 from datetime import datetime, timedelta, timezone
-from typing import Any, List, Mapping, Optional, cast
+from typing import Any, List, Mapping, Optional, cast, Tuple
 from unittest import mock
 
 import google.protobuf.any_pb2
@@ -94,7 +94,7 @@
     assert_eq_eventually,
     ensure_search_attributes_present,
     new_worker,
-    worker_versioning_enabled,
+    worker_versioning_enabled, assert_eventually,
 )
 from tests.helpers.worker import (
     ExternalWorker,
@@ -1510,7 +1510,7 @@ class LastCompletionResultWorkflow:
     async def run(self) -> str:
         last_result = workflow.get_last_completion_result(type_hint=str)
         if last_result is not None:
-            return "From last completion:" + last_result
+            return "From last completion: " + last_result
         else:
             return "My First Result"
 
@@ -1534,11 +1534,20 @@ async def test_schedule_last_completion_result(
             ),
         )
         await handle.trigger()
-        await asyncio.sleep(1)
+        async def get_schedule_result() -> Tuple[int, Optional[str]]:
+            desc = await handle.describe()
+            length = len(desc.info.recent_actions)
+            if length == 0:
+                return length, None
+            else:
+                workflow_id = cast(ScheduleActionExecutionStartWorkflow, desc.info.recent_actions[-1].action).workflow_id
+                workflow_handle = client.get_workflow_handle(workflow_id)
+                result = await workflow_handle.result()
+                return length, result
+
+        assert await get_schedule_result() == (1, "My First Result")
         await handle.trigger()
-        await asyncio.sleep(1)
-        print(await handle.describe())
+        assert await get_schedule_result() == (2, "From last completion: My First Result")
 
         await handle.delete()
-        assert False