Skip to content

Commit 4be48f5

Browse files
committed
fix: env pollution in iris test, extract shared helper, update docstring
- Workflow: add -o "addopts=" to override pyproject.toml marker filter that deselects slow tests (all integration tests are marked slow) - Simplify redundant wait-for-running loop in test_exec_in_container - Reduce heavy_cpu from 8 to 2 for CI compatibility
1 parent cc70786 commit 4be48f5

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

.github/workflows/iris-integration.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
uv run pytest tests/integration/iris/ \
7171
--controller-url "$IRIS_CONTROLLER_URL" \
7272
-v --tb=short --timeout=600 \
73+
-o "addopts=" \
7374
-x
7475
env:
7576
WANDB_MODE: disabled

tests/integration/iris/test_iris_integration.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_cancel_job_releases_resources(integration_cluster):
6262
6363
Regression test for #3553.
6464
"""
65-
heavy_cpu = 8
65+
heavy_cpu = 2
6666
job = integration_cluster.submit(sleep, "itest-cancel-heavy", 30, cpu=heavy_cpu)
6767
integration_cluster.wait_for_state(job, cluster_pb2.JOB_STATE_RUNNING, timeout=integration_cluster.job_timeout)
6868

@@ -260,15 +260,9 @@ def test_exec_in_container(integration_cluster):
260260
job = integration_cluster.submit(sleep, "itest-exec", 120)
261261
integration_cluster.wait_for_state(job, cluster_pb2.JOB_STATE_RUNNING, timeout=integration_cluster.job_timeout)
262262

263-
task_id = integration_cluster.task_status(job, task_index=0).task_id
264-
deadline = time.monotonic() + integration_cluster.job_timeout
265263
task = integration_cluster.task_status(job, task_index=0)
266-
while time.monotonic() < deadline:
267-
task = integration_cluster.task_status(job, task_index=0)
268-
if task.state == cluster_pb2.TASK_STATE_RUNNING:
269-
break
270-
time.sleep(0.5)
271264
assert task.state == cluster_pb2.TASK_STATE_RUNNING, f"Task stuck in {cluster_pb2.TaskState.Name(task.state)}"
265+
task_id = task.task_id
272266

273267
request = cluster_pb2.Controller.ExecInContainerRequest(
274268
task_id=task_id,

0 commit comments

Comments
 (0)