chore(tests): symmetrize diag-log cleanup across every VCR-using conf…

…test ``image_gen_tests/conftest.py`` was the only suite that cleared ``test-results/vcr-diagnostics/*.log`` at session start. The other 12 VCR-using conftests inherited any stale per-PID logs from a previous local run and would dump them in the terminal summary -- harmless in CI (fresh container) but confusing locally when running multiple suites in sequence. Extracts the cleanup into a ``reset_vcr_diag_dir`` helper in ``tests/_vcr_conftest_common.py`` and calls it from every VCR-using conftest's ``pytest_configure``. Same single source of truth, no inline duplication.
BerriAI · mateo-berri · May 14, 2026 · May 17, 2026 · May 17, 2026 · May 17, 2026
commit 32369edb8faa367b8f0f216a4bc797ff3e06d2ec
diff --git a/tests/_vcr_conftest_common.py b/tests/_vcr_conftest_common.py
@@ -57,6 +57,30 @@ def vcr_diag_write_line(msg: str) -> None:
         pass
 
 
+def reset_vcr_diag_dir() -> None:
+    """Delete any leftover per-PID diagnostic logs from a previous session.
+
+    No-op when running on an xdist worker -- the controller does the
+    cleanup once and the workers inherit the (now-empty) directory.
+    Safe to call from any conftest's ``pytest_configure``.
+    """
+    if os.environ.get("PYTEST_XDIST_WORKER"):
+        return
+    directory = _vcr_diag_dir()
+    if not os.path.isdir(directory):
+        return
+    try:
+        names = os.listdir(directory)
+    except OSError:
+        return
+    for name in names:
+        if name.endswith(".log"):
+            try:
+                os.remove(os.path.join(directory, name))
+            except OSError:
+                pass
+
+
 def emit_vcr_diagnostic_log(terminalreporter) -> None:
     directory = _vcr_diag_dir()
     if not os.path.isdir(directory):

diff --git a/tests/audio_tests/conftest.py b/tests/audio_tests/conftest.py
@@ -14,6 +14,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -45,6 +46,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/guardrails_tests/conftest.py b/tests/guardrails_tests/conftest.py
@@ -25,6 +25,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -56,6 +57,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/image_gen_tests/conftest.py b/tests/image_gen_tests/conftest.py
@@ -11,7 +11,6 @@
 
 from tests._vcr_conftest_common import (  # noqa: E402
     VerboseReporterState,
-    _vcr_diag_dir,
     apply_vcr_auto_marker_to_items,
     emit_cassette_cache_session_banner,
     emit_vcr_classification_summary,
@@ -20,6 +19,7 @@
     pin_httpx_multipart_boundary,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -69,15 +69,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
-    if not os.environ.get("PYTEST_XDIST_WORKER"):
-        directory = _vcr_diag_dir()
-        if os.path.isdir(directory):
-            for name in os.listdir(directory):
-                if name.endswith(".log"):
-                    try:
-                        os.remove(os.path.join(directory, name))
-                    except OSError:
-                        pass
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/litellm_utils_tests/conftest.py b/tests/litellm_utils_tests/conftest.py
@@ -21,6 +21,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -87,6 +88,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/llm_responses_api_testing/conftest.py b/tests/llm_responses_api_testing/conftest.py
@@ -22,6 +22,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -53,6 +54,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/llm_translation/conftest.py b/tests/llm_translation/conftest.py
@@ -27,6 +27,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -74,6 +75,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/local_testing/conftest.py b/tests/local_testing/conftest.py
@@ -31,6 +31,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -85,6 +86,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/logging_callback_tests/conftest.py b/tests/logging_callback_tests/conftest.py
@@ -28,6 +28,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -80,6 +81,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/ocr_tests/conftest.py b/tests/ocr_tests/conftest.py
@@ -21,6 +21,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -52,6 +53,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/pass_through_unit_tests/conftest.py b/tests/pass_through_unit_tests/conftest.py
@@ -14,6 +14,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -57,6 +58,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/router_unit_tests/conftest.py b/tests/router_unit_tests/conftest.py
@@ -21,6 +21,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -98,6 +99,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/search_tests/conftest.py b/tests/search_tests/conftest.py
@@ -22,6 +22,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -53,6 +54,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):

diff --git a/tests/unified_google_tests/conftest.py b/tests/unified_google_tests/conftest.py
@@ -21,6 +21,7 @@
     install_live_call_probe,
     record_vcr_outcome,
     register_persister_if_enabled,
+    reset_vcr_diag_dir,
     vcr_config_dict,
 )
 
@@ -85,6 +86,7 @@ def _vcr_outcome_gate(request, vcr):
 
 def pytest_configure(config):
     _verbose_state.remember_pluginmanager(config)
+    reset_vcr_diag_dir()
 
 
 def pytest_runtest_logreport(report):