Put the database and validation overrides in a test FastAPI client fixture

Author: tieneupin

tests/server/api/test_movies.py

@@ -1,6 +1,7 @@
 from unittest.mock import ANY
 
 from fastapi.testclient import TestClient
+from pytest import fixture
 from sqlmodel import Session
 
 from murfey.server.api.auth import validate_instrument_token
@@ -43,11 +44,21 @@
 
 # app.dependency_overrides[murfey_db] = override_murfey_db
 
-client = TestClient(app)
+
+@fixture(scope="module")
+def fastapi_client(murfey_db_session):
+    # Replace the murfey_db instance in endpoint with properly initialised pytest one
+    app.dependency_overrides[murfey_db] = murfey_db_session
+    # Disable instrument token validation
+    app.dependency_overrides[validate_instrument_token] = lambda: None
+
+    with TestClient(app) as client:
+        yield client
 
 
 def test_movie_count(
-    murfey_db_session: Session,
+    fastapi_client: TestClient,
+    murfey_db_session: Session,  # From conftest.py
 ):
 
     # Insert table dependencies
@@ -111,12 +122,7 @@ def test_movie_count(
             },
         )
 
-    # Replace the murfey_db instance in endpoint with properly initialised pytest one
-    app.dependency_overrides[murfey_db] = murfey_db_session
-    # Disable instrument token validation
-    app.dependency_overrides[validate_instrument_token] = lambda: None
-
-    response = client.get(
+    response = fastapi_client.get(
         f"{url_path_for('session_control.router', 'count_number_of_movies')}",
         headers={"Authorization": f"Bearer {ANY}"},
     )