clean up

Author: alexluck-sift

python/docs/examples/pytest_plugin.md

@@ -79,5 +79,17 @@ def ci_pytest_tag(sift_client):
 
 
 def pytest_configure(config: pytest.Config) -> None:
-    """Enable the Sift connection-check mode for the fixtures used in this test suite since we run w/ mock client in non-integration tests."""
-    config.option.sift_test_results_check_connection = True
+    """Pick a plugin mode based on whether integration tests are being run.
+
+    Integration runs targeting a real backend stay online with the log file
+    disabled (writes go inline). Otherwise force offline mode so the autouse
+    plugin fixtures construct cleanly without contacting Sift.
+    """
+    is_integration_run = "integration" in (config.option.markexpr or "")
+    have_real_backend = all(
+        os.getenv(name) for name in ("SIFT_API_KEY", "SIFT_GRPC_URI", "SIFT_REST_URI")
+    )
+    if is_integration_run and have_real_backend:
+        config.option.sift_log_file = "none"
+    else:
+        config.option.sift_offline = True

python/lib/sift_client/_tests/conftest.py

@@ -1,24 +1,15 @@
 """Shared helpers for the pytest-plugin test suite.
 
 The tests in this directory drive inner pytester sessions to exercise the
-plugin's behavior in isolation. The fixtures below produce the boilerplate
-conftests those inner sessions need:
-
-- ``write_plugin_conftest``: minimal conftest that loads the plugin
-- ``write_probe_conftest``: conftest that loads the plugin and runs a probe
-  block inside ``pytest_configure``, useful for inspecting internal state
-  without running tests against a real backend
+plugin's behavior in isolation.
 """
 
 from __future__ import annotations
 
-import textwrap
 from typing import Callable
 
 import pytest
 
-pytest_plugins = ["pytester"]
-
 
 @pytest.fixture
 def write_plugin_conftest(pytester: pytest.Pytester) -> Callable[[], None]:
@@ -28,21 +19,3 @@ def _write() -> None:
         pytester.makeconftest('pytest_plugins = ["sift_client.pytest_plugin"]')
 
     return _write
-
-
-@pytest.fixture
-def write_probe_conftest(pytester: pytest.Pytester) -> Callable[[str], None]:
-    """Return a callable that writes a conftest running ``probe_body`` in ``pytest_configure``.
-
-    ``probe_body`` is python source that runs at config time with ``config``
-    in scope; use ``print(...)`` calls and capture them with
-    ``result.stdout.fnmatch_lines``.
-    """
-
-    def _write(probe_body: str) -> None:
-        pytester.makeconftest(
-            'pytest_plugins = ["sift_client.pytest_plugin"]\n\n'
-            "def pytest_configure(config):\n" + textwrap.indent(textwrap.dedent(probe_body), "    ")
-        )
-
-    return _write

python/lib/sift_client/_tests/pytest_plugin/conftest.py

@@ -1,6 +1,3 @@
-import pytest
-
-
-def pytest_configure(config: pytest.Config) -> None:
-    """Configure the pytest configuration to disable the Sift test results log file."""
-    config.option.sift_test_results_log_file = False
+# Plugin mode (offline vs online, log-file disable) is set by the parent
+# conftest based on the marker expression and env vars. No util-specific
+# overrides are needed.