More precise logging

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=DEBUG --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=DEBUG --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=DEBUG -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=DEBUG
+          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 = "INFO"
-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

@@ -5840,7 +5840,7 @@ async def test_workflow_id_conflict(client: Client):
 
 
 @workflow.defn
-class TestUpdateCompletionIsHonoredWhenAfterWorkflowReturn1:
+class UpdateCompletionIsHonoredWhenAfterWorkflowReturn1Workflow:
     def __init__(self) -> None:
         self.workflow_returned = False
 
@@ -5866,13 +5866,13 @@ async def test_update_completion_is_honored_when_after_workflow_return_1(
     update_id = "my-update"
     task_queue = "tq"
     wf_handle = await client.start_workflow(
-        TestUpdateCompletionIsHonoredWhenAfterWorkflowReturn1.run,
+        UpdateCompletionIsHonoredWhenAfterWorkflowReturn1Workflow.run,
         id=f"wf-{uuid.uuid4()}",
         task_queue=task_queue,
     )
     update_result_task = asyncio.create_task(
         wf_handle.execute_update(
-            TestUpdateCompletionIsHonoredWhenAfterWorkflowReturn1.my_update,
+            UpdateCompletionIsHonoredWhenAfterWorkflowReturn1Workflow.my_update,
             id=update_id,
         )
     )
@@ -5881,7 +5881,7 @@ async def test_update_completion_is_honored_when_after_workflow_return_1(
     async with Worker(
         client,
         task_queue=task_queue,
-        workflows=[TestUpdateCompletionIsHonoredWhenAfterWorkflowReturn1],
+        workflows=[UpdateCompletionIsHonoredWhenAfterWorkflowReturn1Workflow],
     ):
         assert await wf_handle.result() == "workflow-result"
         assert await update_result_task == "update-result"