diff --git a/tests/conftest.py b/tests/conftest.py index 3c02d8d18..4b97ef72a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -145,6 +145,9 @@ async def env(env_type: str) -> AsyncGenerator[WorkflowEnvironment, None]: dev_server_extra_args=[ "--dynamic-config-value", "system.forceSearchAttributesCacheRefreshOnRead=true", + # Keep a stalled first workflow task from timing out and retrying on slow CI + "--dynamic-config-value", + 'history.defaultWorkflowTaskTimeout="60s"', "--dynamic-config-value", f"limit.historyCount.suggestContinueAsNew={CONTINUE_AS_NEW_SUGGEST_HISTORY_COUNT}", "--dynamic-config-value", diff --git a/tests/worker/test_workflow.py b/tests/worker/test_workflow.py index c4fe53271..8304a2a1b 100644 --- a/tests/worker/test_workflow.py +++ b/tests/worker/test_workflow.py @@ -227,7 +227,7 @@ async def run(self) -> dict: return json.loads(json.dumps(ret, default=str)) -async def test_workflow_info(client: Client, env: WorkflowEnvironment): +async def test_workflow_info(client: Client, env: WorkflowEnvironment, env_type: str): # TODO(cretz): Fix if env.supports_time_skipping: pytest.skip( @@ -258,7 +258,8 @@ async def test_workflow_info(client: Client, env: WorkflowEnvironment): assert uuid.UUID(info["run_id"]).version == 7 assert info["run_timeout"] is None assert info["task_queue"] == worker.task_queue - assert info["task_timeout"] == "0:00:10" + # Only the local dev server gets the 60s default from tests/conftest.py + assert info["task_timeout"] == ("0:01:00" if env_type == "local" else "0:00:10") assert info["workflow_id"] == workflow_id assert info["workflow_type"] == "InfoWorkflow"