Skip to content

Commit e6c0f3c

Browse files
committed
Import 'murfey_db' only after mocks have been set
1 parent 2269269 commit e6c0f3c

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

tests/server/api/test_movies.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from unittest.mock import ANY
1+
from unittest.mock import ANY, patch
22

33
import pytest
44
from fastapi.testclient import TestClient
55
from sqlmodel import Session
66

77
from murfey.server.api.auth import validate_instrument_token
88
from murfey.server.main import app
9-
from murfey.server.murfey_db import murfey_db
109
from murfey.util.api import url_path_for
10+
from murfey.util.config import security_from_file
1111
from murfey.util.db import (
1212
AutoProcProgram,
1313
DataCollection,
@@ -16,7 +16,7 @@
1616
MurfeyLedger,
1717
ProcessingJob,
1818
)
19-
from tests.conftest import ExampleVisit, get_or_create_db_entry
19+
from tests.conftest import ExampleVisit, get_or_create_db_entry, murfey_db_url
2020

2121
# @pytest.fixture(scope="module")
2222
# def test_user():
@@ -45,8 +45,24 @@
4545
# app.dependency_overrides[murfey_db] = override_murfey_db
4646

4747

48+
@patch("murfey.server.murfey_db.get_security_config")
49+
@patch("murfey.server.murfey_db.url")
4850
@pytest.fixture
49-
def fastapi_client(murfey_db_session):
51+
def fastapi_client(
52+
mock_get_url,
53+
mock_get_security_config,
54+
mock_security_configuration,
55+
murfey_db_session,
56+
):
57+
# Set up mock security configs for
58+
mock_get_url.return_value = murfey_db_url
59+
mock_get_security_config.return_value = security_from_file(
60+
mock_security_configuration
61+
)
62+
63+
# Defer import of 'murfey_db' until after mocks are configured
64+
from murfey.server.murfey_db import murfey_db
65+
5066
# Replace the murfey_db instance in endpoint with properly initialised pytest one
5167
app.dependency_overrides[murfey_db] = murfey_db_session
5268
# Disable instrument token validation

0 commit comments

Comments
 (0)