fix: env pollution in iris test, extract shared helper, update docstring

- Use monkeypatch instead of os.environ mutation in test_marin_on_iris
- Move _make_controller_only_config to conftest.py as shared helper
- Update stale docstring in test_iris_integration.py

Author: rjpower

lib/iris/tests/conftest.py

@@ -7,15 +7,38 @@
 import os
 import subprocess
 import sys
+from pathlib import Path
 import threading
 import time
 import traceback
 import warnings
 
 import pytest
+from iris.cluster.config import load_config, make_local_config
+from iris.rpc import config_pb2
 from iris.test_util import SentinelFile
 from iris.time_utils import Deadline, Duration
 
+IRIS_ROOT = Path(__file__).resolve().parents[1]
+DEFAULT_CONFIG = IRIS_ROOT / "examples" / "test.yaml"
+
+
+def _make_controller_only_config() -> config_pb2.IrisClusterConfig:
+    """Build a local config with no auto-scaled workers."""
+    config = load_config(DEFAULT_CONFIG)
+    config.scale_groups.clear()
+    sg = config.scale_groups["placeholder"]
+    sg.name = "placeholder"
+    sg.num_vms = 1
+    sg.min_slices = 0
+    sg.max_slices = 0
+    sg.resources.cpu_millicores = 1000
+    sg.resources.memory_bytes = 1 * 1024**3
+    sg.resources.disk_bytes = 10 * 1024**3
+    sg.resources.device_type = config_pb2.ACCELERATOR_TYPE_CPU
+    sg.slice_template.local.SetInParent()
+    return make_local_config(config)
+
 
 def _docker_image_exists(tag: str) -> bool:
     try:

lib/iris/tests/test_auth.py

@@ -2,39 +2,18 @@
 # SPDX-License-Identifier: Apache-2.0
 """Auth tests for Iris controller with static token authentication."""
 
-from pathlib import Path
-
 import pytest
-from iris.cluster.config import load_config, make_local_config
 from iris.cluster.local_cluster import LocalCluster
 from iris.cluster.types import Entrypoint, ResourceSpec
-from iris.rpc import cluster_pb2, config_pb2
+from iris.rpc import cluster_pb2
 from iris.rpc.cluster_connect import ControllerServiceClientSync
 
-IRIS_ROOT = Path(__file__).resolve().parents[1]
-DEFAULT_CONFIG = IRIS_ROOT / "examples" / "test.yaml"
+from .conftest import _make_controller_only_config
 
 _AUTH_TOKEN = "e2e-test-token"
 _AUTH_USER = "test-user"
 
 
-def _make_controller_only_config() -> config_pb2.IrisClusterConfig:
-    """Build a local config with no auto-scaled workers."""
-    config = load_config(DEFAULT_CONFIG)
-    config.scale_groups.clear()
-    sg = config.scale_groups["placeholder"]
-    sg.name = "placeholder"
-    sg.num_vms = 1
-    sg.min_slices = 0
-    sg.max_slices = 0
-    sg.resources.cpu_millicores = 1000
-    sg.resources.memory_bytes = 1 * 1024**3
-    sg.resources.disk_bytes = 10 * 1024**3
-    sg.resources.device_type = config_pb2.ACCELERATOR_TYPE_CPU
-    sg.slice_template.local.SetInParent()
-    return make_local_config(config)
-
-
 def _login_for_jwt(url: str, identity_token: str) -> str:
     """Exchange a raw identity token for a JWT via the Login RPC."""
     client = ControllerServiceClientSync(address=url, timeout_ms=10000)

lib/iris/tests/test_gpu_metadata.py

@@ -16,7 +16,7 @@
 from iris.rpc.cluster_connect import ControllerServiceClientSync
 from iris.time_utils import Duration
 
-from .test_auth import _make_controller_only_config
+from .conftest import _make_controller_only_config
 
 _NVIDIA_SMI_H100_8X = "\n".join(["NVIDIA H100 80GB HBM3, 81559"] * 8)
 

tests/integration/iris/test_iris_integration.py

@@ -3,9 +3,8 @@
 
 """Iris integration tests exercising job lifecycle, scheduling, and cluster features.
 
-These tests replace the "cloud smoke test" and run against either a local in-process
-cluster (default) or an existing controller via --controller-url. No dashboard
-screenshots are taken here; those remain in lib/iris/tests/e2e/test_smoke.py.
+These tests run against an existing controller specified via --controller-url.
+No dashboard screenshots are taken here; those remain in lib/iris/tests/e2e/test_smoke.py.
 """
 
 import logging

tests/integration/iris/test_marin_on_iris.py

@@ -28,14 +28,14 @@
 
 
 @pytest.mark.timeout(600)
-def test_marin_pipeline_on_iris(integration_cluster):
+def test_marin_pipeline_on_iris(integration_cluster, monkeypatch):
     """Run the full marin data pipeline dispatched through Iris."""
     prefix = tempfile.mkdtemp(prefix="iris-marin-itest-")
     try:
-        os.environ["MARIN_PREFIX"] = prefix
-        os.environ.setdefault("WANDB_MODE", "disabled")
-        os.environ.setdefault("WANDB_API_KEY", "")
-        os.environ.setdefault("JAX_TRACEBACK_FILTERING", "off")
+        monkeypatch.setenv("MARIN_PREFIX", prefix)
+        monkeypatch.setenv("WANDB_MODE", "disabled")
+        monkeypatch.setenv("WANDB_API_KEY", "")
+        monkeypatch.setenv("JAX_TRACEBACK_FILTERING", "off")
 
         iris_client = FrayIrisClient(
             controller_address=integration_cluster.url,