Personal AI, On Personal Devices
Python
test(core): stop credential tests leaking TAVILY_API_KEY across the session (#811)
havolline1c417c0605a3f
diff --git a/tests/core/test_credentials.py b/tests/core/test_credentials.pyindex f8ea8578..6f7888e5 100644--- a/tests/core/test_credentials.py+++ b/tests/core/test_credentials.py@@ -5,6 +5,7 @@ import osimport pytestfrom openjarvis.core.credentials import (+ TOOL_CREDENTIALS,delete_credential,get_credential_status,inject_credentials,@@ -12,20 +13,71 @@ from openjarvis.core.credentials import (save_credential,)+_CREDENTIAL_ENV_KEYS = frozenset(+ key for keys in TOOL_CREDENTIALS.values() for key in keys+)+_ENV_BASELINE = {+ key: value for key, value in os.environ.items() if key in _CREDENTIAL_ENV_KEYS+}+@pytest.fixturedef cred_path(tmp_path):return tmp_path / "credentials.toml"+def _restore_credential_environ(snapshot):+ """Restore credential variables without disturbing pytest/process internals."""+ for key in _CREDENTIAL_ENV_KEYS:+ if key in snapshot:+ os.environ[key] = snapshot[key]+ else:+ os.environ.pop(key, None)++[email protected](autouse=True)+def _isolate_environ():+ """Reset os.environ to the collection baseline around every test.++ save_credential()/inject_credentials()/delete_credential() mutate+ os.environ directly as a side effect of file persistence -- they are+ production code, not test doubles, so monkeypatch's undo stack has no+ idea those mutations happened. A test that used+ monkeypatch.delenv("TAVILY_API_KEY") to clear the var before calling+ one of these functions would have monkeypatch snapshot whatever value+ had already leaked in from an earlier test and then RESTORE that+ leaked value at teardown -- permanently re-leaking it into every+ later test in the session, including tests/security/+ test_data_boundary_audit.py's cloud-surface detection (#788).+ Resetting both before and after each test makes isolation independent+ of test order while preserving legitimate ambient credentials supplied+ by the developer or CI process.+ """+ _restore_credential_environ(_ENV_BASELINE)+ yield+ _restore_credential_environ(_ENV_BASELINE)++def test_save_and_load(cred_path):save_credential("web_search", "TAVILY_API_KEY", "tvly-123", path=cred_path)creds = load_credentials(path=cred_path)assert creds["web_search"]["TAVILY_API_KEY"] == "tvly-123"-def test_save_sets_env(cred_path, monkeypatch):- monkeypatch.delenv("TAVILY_API_KEY", raising=False)+def test_restore_environ_preserves_legitimate_ambient_key(cred_path):+ """Regression for #788 must not erase a real key from the parent process."""+ baseline = {"TAVILY_API_KEY": "tvly-legitimate-ambient"}+ _restore_credential_environ(baseline)++ save_credential("web_search", "TAVILY_API_KEY", "tvly-test", path=cred_path)+ assert os.environ["TAVILY_API_KEY"] == "tvly-test"++ _restore_credential_environ(baseline)+ assert os.environ["TAVILY_API_KEY"] == "tvly-legitimate-ambient"+++def test_save_sets_env(cred_path):+ os.environ.pop("TAVILY_API_KEY", None)save_credential("web_search", "TAVILY_API_KEY", "tvly-abc", path=cred_path)assert os.environ["TAVILY_API_KEY"] == "tvly-abc"@@ -46,8 +98,8 @@ def test_get_status(cred_path, monkeypatch):assert status["TAVILY_API_KEY"] is True-def test_get_status_missing(monkeypatch):- monkeypatch.delenv("TAVILY_API_KEY", raising=False)+def test_get_status_missing():+ os.environ.pop("TAVILY_API_KEY", None)status = get_credential_status("web_search")assert status["TAVILY_API_KEY"] is False@@ -58,16 +110,16 @@ def test_file_permissions(cred_path):assert mode == "0o600"-def test_inject_credentials_restores_saved_value(cred_path, monkeypatch):+def test_inject_credentials_restores_saved_value(cred_path):save_credential("web_search", "TAVILY_API_KEY", "tvly-persisted", path=cred_path)- monkeypatch.delenv("TAVILY_API_KEY")+ os.environ.pop("TAVILY_API_KEY", None)inject_credentials(path=cred_path)assert os.environ["TAVILY_API_KEY"] == "tvly-persisted"-def test_delete_credential_removes_file_value_and_env(cred_path, monkeypatch):+def test_delete_credential_removes_file_value_and_env(cred_path):save_credential("web_search", "TAVILY_API_KEY", "tvly-delete", path=cred_path)delete_credential("web_search", "TAVILY_API_KEY", path=cred_path)