fix(tests): whole test suite can now be run

Author: jbriones1

pyproject.toml

@@ -66,7 +66,8 @@ ignore = ["E501", "F401", "N806"]
 # [Based]Pyright: Type checker/LSP
 [tool.pyright]
 executionEnvironments = [
-    { root = "src", pythonVersion = "3.11" }
+    { root = "src", pythonVersion = "3.11" },
+    { root = "tests", extraPaths=["src"], pythonVersion = "3.11" }
 ]
 typeCheckingMode = "standard"
 reportAny = "none" # Allow the use of `Any` type

src/officers/crud.py

@@ -17,7 +17,7 @@
 
 
 async def current_officers(
-    db_session: database.DBSession, include_private: bool
+    db_session: database.DBSession, include_private: bool = False
 ) -> list[OfficerPrivate] | list[OfficerPublic]:
     """
     Get info about officers that are active. Go through all active & complete officer terms.

tests/integration/conftest.py tests/conftest.pytests/integration/conftest.py renamed to tests/conftest.py

@@ -7,10 +7,10 @@
 import pytest_asyncio
 from httpx import ASGITransport, AsyncClient
 
-from src import load_test_db
-from src.auth.crud import create_user_session, remove_user_session
-from src.database import SQLALCHEMY_TEST_DATABASE_URL, DatabaseSessionManager
-from src.main import app
+from auth.crud import create_user_session, remove_user_session
+from database import SQLALCHEMY_TEST_DATABASE_URL, DatabaseSessionManager
+from load_test_db import SYSADMIN_COMPUTING_ID, async_main
+from main import app
 
 
 # This might be able to be moved to `package` scope as long as I inject it to every test function
@@ -20,17 +20,19 @@ def suppress_sqlalchemy_logs():
     yield
     logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO)
 
+
 @pytest_asyncio.fixture(scope="session", loop_scope="session")
 async def database_setup():
     # reset the database again, just in case
     print("Resetting DB...")
     sessionmanager = DatabaseSessionManager(SQLALCHEMY_TEST_DATABASE_URL, {"echo": False}, check_db=False)
     # this resets the contents of the database to be whatever is from `load_test_db.py`
-    await load_test_db.async_main(sessionmanager)
+    await async_main(sessionmanager)
     print("Done setting up!")
     yield sessionmanager
     await sessionmanager.close()
 
+
 @pytest_asyncio.fixture(scope="session", loop_scope="session")
 async def client() -> AsyncGenerator[Any, None]:
     # base_url is just a random placeholder url
@@ -39,18 +41,18 @@ async def client() -> AsyncGenerator[Any, None]:
     async with AsyncClient(transport=ASGITransport(app), base_url="http://test") as client:
         yield client
 
+
 @pytest_asyncio.fixture(scope="function", loop_scope="session")
 async def db_session(database_setup):
     async with database_setup.session() as session:
         yield session
 
+
 @pytest_asyncio.fixture(scope="module", loop_scope="session")
 async def admin_client(database_setup, client):
-    session_id = "temp_id_" + load_test_db.SYSADMIN_COMPUTING_ID
-    client.cookies = { "session_id": session_id }
+    session_id = "temp_id_" + SYSADMIN_COMPUTING_ID
+    client.cookies = {"session_id": session_id}
     async with database_setup.session() as session:
-        await create_user_session(session, session_id, load_test_db.SYSADMIN_COMPUTING_ID)
+        await create_user_session(session, session_id, SYSADMIN_COMPUTING_ID)
         yield client
         await remove_user_session(session, session_id)
-
-