Add test verifying async ordering

Author: Sushisource

temporalio/worker/_workflow_instance.py

@@ -369,12 +369,13 @@ def activate(
                 # Let errors bubble out of these to the caller to fail the task
                 self._apply(job)
 
-            # Ensure the main workflow function is called, and called last, if needed
-            if self._primary_task_initter is not None and self._primary_task is None:
-                self._primary_task_initter()
             # Conditions are not checked on query activations. Query activations always come without
             # any other jobs.
             self._run_once(check_conditions=not is_query)
+            # Ensure the main workflow function is called on first task, and called last.
+            if self._primary_task_initter is not None and self._primary_task is None:
+                self._primary_task_initter()
+                self._run_once(check_conditions=True)
         except Exception as err:
             # We want some errors during activation, like those that can happen
             # during payload conversion, to be able to fail the workflow not the

tests/worker/test_workflow.py

@@ -6445,14 +6445,12 @@ async def test_concurrent_sleeps_use_proper_options(
 class SignalsActivitiesTimersUpdatesTracingWorkflow:
     def __init__(self) -> None:
         self.events = []
-        self.do_finish = False
 
     @workflow.run
     async def run(self) -> list[str]:
         tt = asyncio.create_task(self.run_timer())
         at = asyncio.create_task(self.run_act())
         await asyncio.gather(tt, at)
-        await workflow.wait_condition(lambda: self.do_finish)
         return self.events
 
     @workflow.signal
@@ -6475,10 +6473,6 @@ async def doupdate(self, name: str):
         await workflow.wait_condition(lambda: True)
         self.events.append(f"update-{name}-2")
 
-    @workflow.signal
-    async def do_finish(self):
-        self.do_finish = True
-
     async def run_timer(self):
         self.events.append("timer-sync")
         await workflow.sleep(0.1)
@@ -6517,26 +6511,26 @@ async def test_async_loop_ordering(client: Client):
         activities=[say_hello],
         task_queue=task_queue,
     ):
+        await asyncio.sleep(0.2)
         await handle.signal(SignalsActivitiesTimersUpdatesTracingWorkflow.dosig, "1")
         await handle.execute_update(
             SignalsActivitiesTimersUpdatesTracingWorkflow.doupdate, "1"
         )
-        await handle.signal(SignalsActivitiesTimersUpdatesTracingWorkflow.do_finish)
-        expected = [
+        expected_old = [
             "sig-before-sync",
             "sig-before-1",
+            "sig-before-2",
+            "timer-sync",
+            "act-sync",
+            "act-1",
+            "act-2",
             "sig-1-sync",
             "sig-1-1",
+            "sig-1-2",
             "update-1-sync",
             "update-1-1",
-            'timer-sync',
-            'act-sync',
-            'sig-before-2',
-            'sig-1-2',
-            'update-1-2',
-            'act-1',
-            'act-2',
-            'timer-1',
-            'timer-2',
+            "update-1-2",
+            "timer-1",
+            "timer-2"
         ]
-        assert await handle.result() == expected
+        assert await handle.result() == expected_old