Merge branch 'main' into remove-update-experimental-notices

Author: dandavison

.github/workflows/ci.yml

@@ -53,13 +53,13 @@ jobs:
       - run: poe lint
       - run: poe build-develop
       - run: mkdir junit-xml
-      - run: poe test -s -o log_cli_level=WARN --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
+      - run: poe test -s --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}.xml
       # Time skipping doesn't yet support ARM
       - if: ${{ !endsWith(matrix.os, '-arm') }}
-        run: poe test -s -o log_cli_level=WARN --workflow-environment time-skipping --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}--time-skipping.xml
+        run: poe test -s --workflow-environment time-skipping --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}--time-skipping.xml
       # Check cloud if proper target and not on fork
       - if: ${{ matrix.cloudTestTarget && (github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == 'temporalio/sdk-python') }}
-        run: poe test -s -o log_cli_level=WARN -k test_cloud_client --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}--cloud.xml
+        run: poe test -s -k test_cloud_client --junit-xml=junit-xml/${{ matrix.python }}--${{ matrix.os }}--cloud.xml
         env:
           TEMPORAL_CLIENT_CLOUD_API_KEY: ${{ secrets.TEMPORAL_CLIENT_CLOUD_API_KEY }}
           TEMPORAL_CLIENT_CLOUD_API_VERSION: 2024-05-13-00
@@ -87,7 +87,7 @@ jobs:
           poe gen-protos
           poe format
           [[ -z $(git status --porcelain temporalio) ]] || (git diff temporalio; echo "Protos changed"; exit 1)
-          poe test -s -o log_cli_level=WARN
+          poe test -s
 
       # Do docs stuff (only on one host)
       - name: Build API docs

pyproject.toml

@@ -105,9 +105,10 @@ cmd = "pip uninstall temporalio -y"
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
-log_cli = true
-log_cli_level = "WARN"
-log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+# Do not use log_cli since this shows logging for all tests, not just the ones
+# that failed. Instead, show all logs for failed tests at the end.
+log_level = "DEBUG"
+log_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
 testpaths = ["tests"]
 timeout = 600
 timeout_func_only = true

tests/worker/test_workflow.py

@@ -5502,12 +5502,11 @@ async def _get_workflow_result(
             await handle.signal(handler_name)
         else:
             if not wait_all_handlers_finished:
-                with pytest.raises(RPCError) as err:
+                with pytest.raises(WorkflowUpdateFailedError) as err_info:
                     await handle.execute_update(handler_name, id="my-update")
-                assert (
-                    err.value.status == RPCStatusCode.NOT_FOUND
-                    and "workflow execution already completed" in str(err.value).lower()
-                )
+                update_err = err_info.value
+                assert isinstance(update_err.cause, ApplicationError)
+                assert update_err.cause.type == "AcceptedUpdateCompletedWorkflow"
             else:
                 await handle.execute_update(handler_name, id="my-update")
 
@@ -5736,11 +5735,12 @@ async def _run_workflow_and_get_warning(self) -> bool:
                     if self.handler_waiting == "-wait-all-handlers-finish-":
                         await update_task
                     else:
-                        with pytest.raises(RPCError) as update_err:
+                        with pytest.raises(WorkflowUpdateFailedError) as err_info:
                             await update_task
-                        assert update_err.value.status == RPCStatusCode.NOT_FOUND and (
-                            str(update_err.value).lower()
-                            == "workflow execution already completed"
+                        update_err = err_info.value
+                        assert isinstance(update_err.cause, ApplicationError)
+                        assert (
+                            update_err.cause.type == "AcceptedUpdateCompletedWorkflow"
                         )
 
                 with pytest.raises(WorkflowFailureError) as err: