Merge pull request #23 from getmarkus/cm-branch-21

feat(tests): add environment markers and test-specific settings

Author: getmarkus

.trunk/trunk.yaml

@@ -23,11 +23,11 @@ lint:
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].367
+    - [email protected].368
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].4
+    - [email protected].5
     - [email protected]
     - [email protected]
 actions:

app/interface_adapters/containers.py

@@ -15,11 +15,15 @@ class Container(containers.DeclarativeContainer):
     db_session = providers.Factory(Session, bind=db_engine)
 
     # Repositories
-    issue_repository = providers.Factory(
-        (
-            SQLModelIssueRepository
-            if settings.execution_mode == "sqlmodel"
-            else InMemoryIssueRepository
-        ),
-        session=db_session if settings.execution_mode == "sqlmodel" else None,
+    sqlmodel_repository = providers.Factory(SQLModelIssueRepository, session=db_session)
+
+    in_memory_repository = providers.Factory(InMemoryIssueRepository)
+
+    def get_model_config():
+        return settings.model_config
+
+    issue_repository = providers.Selector(
+        get_model_config,
+        sqlmodel=sqlmodel_repository,
+        **{"in-memory": in_memory_repository},
     )

app/resource_adapters/persistence/sqlmodel/database.py

@@ -46,7 +46,7 @@ def get_engine(database_url: str | None = None) -> Engine:
             logger.info("SQLite WAL mode enabled")
 
     # Initialize database if using SQLModel
-    if settings.execution_mode == "sqlmodel" and not settings.migrate_database:
+    if settings.model_config == "sqlmodel" and not settings.migrate_database:
         logger.info("Creating database tables...")
         SQLModel.metadata.create_all(_engine)
         logger.info("Database tables created successfully")

app/tests/conftest.py

@@ -1,6 +1,9 @@
+import os
 from contextlib import asynccontextmanager
 
 import pytest
+from _pytest.config import Config
+from _pytest.nodes import Item
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from sqlmodel import Session, delete
@@ -10,24 +13,63 @@
 from app.resource_adapters.persistence.sqlmodel.issues import Issue
 
 
+def pytest_configure(config: Config) -> None:
+    """Register env marker."""
+    config.addinivalue_line(
+        "markers", "env(name): mark test to run only on named environment"
+    )
+
+
+def pytest_runtest_setup(item: Item) -> None:
+    """Set up environment for each test based on env marker."""
+    envnames = [mark.args[0] for mark in item.iter_markers(name="env")]
+    if envnames:
+        # Set environment to the first env marker found
+        os.environ["APP_ENV"] = envnames[0]
+    else:
+        # Default to testing environment if no env marker
+        os.environ["APP_ENV"] = "testing"
+
+
+def pytest_unconfigure(config: Config) -> None:
+    """Clean up after each test."""
+    # Remove test database if it exists
+    if os.path.exists("test.db"):
+        os.remove("test.db")
+
+
 @asynccontextmanager
 async def test_lifespan(app: FastAPI):
+    """Test-specific lifespan that sets up and tears down test resources."""
     yield
+    # Cleanup will happen in pytest_unconfigure
 
 
 # Create test app using the factory with test lifespan
 app = create_app(lifespan_handler=test_lifespan)
 
 
 @pytest.fixture(name="session", autouse=True)
-def session_fixture():
+@pytest.mark.env("testing")
+def test_session():
+    """Session fixture for testing environment using test database."""
     with Session(get_engine()) as session:
         yield session
         statement = delete(Issue)
         session.exec(statement)
         session.commit()
 
 
+@pytest.fixture(name="session", autouse=True)
+@pytest.mark.env("development")
+def dev_session():
+    """Session fixture for development environment."""
+    with Session(get_engine()) as session:
+        yield session
+        # In development, we might want to keep the data
+        # or handle cleanup differently
+
+
 @pytest.fixture(name="client")
 def client_fixture():
     with TestClient(app) as client:

app/tests/test_issues.py

@@ -8,6 +8,7 @@
 from app.resource_adapters.persistence.sqlmodel.issues import SQLModelIssueRepository
 
 
+@pytest.mark.env("testing")
 def test_analyze_issue_command(client: TestClient, session: Session):
     # Test case 1: Successful analysis
     issue_number = 1
@@ -25,6 +26,7 @@ def test_analyze_issue_command(client: TestClient, session: Session):
     assert response.issue_number == issue_number
 
 
+@pytest.mark.env("development")
 def test_analyze_issue_client(client: TestClient, session: Session):
     # Test case 1: Successful analysis
     issue_number = 1

app/tests/test_main.py

@@ -3,8 +3,6 @@
 
 from main import app
 
-
-
 # https://sqlmodel.tiangolo.com/tutorial/fastapi/tests/
 # @pytest.fixture(name="session")
 # def session_fixture():
@@ -25,42 +23,47 @@ def client_fixture():
 
     with TestClient(app) as client:
         yield client
-        #app.dependency_overrides.clear()
+        # app.dependency_overrides.clear()
 
 
 def test_root(client: TestClient):
     response = client.get("/")
     assert response.status_code == 200
     assert response.json()["app_name"] == "python-template"
 
+
 def test_health(client: TestClient):
     response = client.get("/health")
     assert response.status_code == 200
 
+
 def test_startup(client: TestClient):
     response = client.get("/startup")
     assert response.status_code == 200
 
+
 def test_readiness(client: TestClient):
     response = client.get("/readiness")
     assert response.status_code == 200
 
+
 def test_liveness(client: TestClient):
     response = client.get("/liveness")
     assert response.status_code == 200
 
+
 def test_smoke(client: TestClient):
     response = client.get("/smoke")
     assert response.status_code == 200
 
+
 def test_info(client: TestClient):
     response = client.get("/info")
     assert response.status_code == 200
     data = response.json()
     assert "app_name" in data
     assert data["app_name"] == "python-template"
     assert "system_time" in data
-    assert "execution_mode" in data
+    assert "model_config" in data
     assert "env_smoke_test" in data
     assert data["env_smoke_test"] == "configured"
-

config.py

@@ -13,7 +13,11 @@
 
 settings = Dynaconf(
     envvar_prefix="APP",
-    settings_files=["settings.toml", ".secrets.toml"],
+    settings_files=[
+        "settings.toml",  # Base settings
+        ".secrets.toml",  # Secret settings
+        "settings.test.toml",  # Test-specific settings, loaded when APP_ENV=testing
+    ],
     environments=True,
     load_dotenv=True,
     validators=[
@@ -37,6 +41,6 @@ class Settings:
     database_url: str
     migrate_database: bool
     backend_cors_origins: List[AnyHttpUrl]
-    execution_mode: str
+    model_config: str
     env_smoke_test: str
     sqlite_wal_mode: bool = False

main.py

@@ -153,7 +153,7 @@ async def info() -> Dict[str, Any]:
     return {
         "app_name": settings.project_name,
         "system_time": datetime.datetime.now(),
-        "execution_mode": settings.execution_mode,
+        "model_config": settings.model_config,
         "env_smoke_test": settings.env_smoke_test,
         "env": settings.current_env,
     }

settings.test.toml

@@ -0,0 +1,17 @@
+# Test-specific settings that override settings.toml when APP_ENV=testing
+[default]
+# sqlite:///./test.db sqlite://
+database_url = "sqlite://"
+# in-memory, sqlmodel
+model_config = "sqlmodel"
+env_smoke_test = "configured"
+backend_cors_origins = ["http://testserver"]
+migrate_database = false
+sqlite_wal_mode = false
+
+# You can still use environment-specific overrides in test settings
+[development]
+env_smoke_test = "development-test"
+
+[production]
+env_smoke_test = "production-test"

settings.toml

@@ -2,7 +2,8 @@
 project_name = "python-template"
 database_url = "sqlite:///./issues.db"
 migrate_database = false
-execution_mode = "sqlmodel"
+# in-memory, sqlmodel
+model_config = "sqlmodel"
 env_smoke_test = ""
 sqlite_wal_mode = false
 
@@ -31,3 +32,6 @@ cors_allow_methods = [
   "PUT",
   "DELETE",
 ] # Be more restrictive in production
+
+[testing]
+# Test-specific settings