fix(tests): isolate compare endpoint owner-scope test

Removes module-level core.database stubbing from the compare endpoint owner-scope regression test and patches ModelEndpoint per test with monkeypatch. Restores one focused part of the Python CI baseline tracked in #2580.
This commit is contained in:
Alexandre Teixeira
2026-06-04 19:17:15 +01:00
committed by GitHub
parent dd707ddb1e
commit 0ead3a4eb2

View File

@@ -10,27 +10,10 @@ Mirrors the session `_owned_endpoint` and research `_owned_enabled_endpoint`
fixes. fixes.
""" """
import sys
import types
from types import SimpleNamespace from types import SimpleNamespace
from unittest.mock import MagicMock
# Stub core.database so importing routes.compare_routes (which drags in import core.database
# core.session_manager) is cheap under the sqlalchemy MagicMock stubs. The from routes.compare_routes import _owned_endpoint_by_url
# helper resolves ModelEndpoint at call time; we swap in a fake declarative
# class below. owner_filter stays REAL.
if "core.database" not in sys.modules:
sys.modules["core.database"] = types.ModuleType("core.database")
_cd = sys.modules["core.database"]
_cd.Base = MagicMock()
for _name in (
"Session", "ChatMessage", "Document", "DocumentVersion", "GalleryImage",
"GalleryAlbum", "SessionLocal", "Comparison", "ModelEndpoint",
):
if not hasattr(_cd, _name):
setattr(_cd, _name, MagicMock())
from routes.compare_routes import _owned_endpoint_by_url # noqa: E402
class _Predicate: class _Predicate:
@@ -82,40 +65,40 @@ def _ep(base_url, owner):
return SimpleNamespace(base_url=base_url, owner=owner, api_key="sk-secret") return SimpleNamespace(base_url=base_url, owner=owner, api_key="sk-secret")
def _resolve(rows, base_url, owner): def _resolve(monkeypatch, rows, base_url, owner):
sys.modules["core.database"].ModelEndpoint = _ModelEndpoint monkeypatch.setattr(core.database, "ModelEndpoint", _ModelEndpoint)
return _owned_endpoint_by_url(_DB(rows), base_url, owner) return _owned_endpoint_by_url(_DB(rows), base_url, owner)
URL = "https://api.example.com/v1" URL = "https://api.example.com/v1"
def test_rejects_another_owners_private_endpoint(): def test_rejects_another_owners_private_endpoint(monkeypatch):
# bob owns the only endpoint at URL; alice supplying that URL gets None # bob owns the only endpoint at URL; alice supplying that URL gets None
# → no headers, no key copied into her comparison session. # → no headers, no key copied into her comparison session.
rows = [_ep(URL, "bob")] rows = [_ep(URL, "bob")]
assert _resolve(rows, URL, "alice") is None assert _resolve(monkeypatch, rows, URL, "alice") is None
def test_returns_callers_own_endpoint(): def test_returns_callers_own_endpoint(monkeypatch):
rows = [_ep(URL, "bob"), _ep(URL, "alice")] rows = [_ep(URL, "bob"), _ep(URL, "alice")]
ep = _resolve(rows, URL, "alice") ep = _resolve(monkeypatch, rows, URL, "alice")
assert ep is not None and ep.owner == "alice" assert ep is not None and ep.owner == "alice"
def test_allows_legacy_null_owner_shared_row(): def test_allows_legacy_null_owner_shared_row(monkeypatch):
rows = [_ep(URL, None)] rows = [_ep(URL, None)]
ep = _resolve(rows, URL, "alice") ep = _resolve(monkeypatch, rows, URL, "alice")
assert ep is not None and ep.owner is None assert ep is not None and ep.owner is None
def test_no_match_returns_none(): def test_no_match_returns_none(monkeypatch):
rows = [_ep("https://other.example/v1", "alice")] rows = [_ep("https://other.example/v1", "alice")]
assert _resolve(rows, URL, "alice") is None assert _resolve(monkeypatch, rows, URL, "alice") is None
def test_null_owner_is_legacy_single_user_noop(): def test_null_owner_is_legacy_single_user_noop(monkeypatch):
# Single-user / unresolved owner: owner_filter no-op, exact URL match wins. # Single-user / unresolved owner: owner_filter no-op, exact URL match wins.
rows = [_ep(URL, "bob")] rows = [_ep(URL, "bob")]
ep = _resolve(rows, URL, None) ep = _resolve(monkeypatch, rows, URL, None)
assert ep is not None and ep.owner == "bob" assert ep is not None and ep.owner == "bob"