test: stabilize fixture boundaries and settings test split

Author: ivanprytula

Justfile

@@ -202,6 +202,25 @@ restore-s3-mongodb s3uri:
 api-check:
     @curl -sf http://localhost:8000/readyz > /dev/null && echo "stack ready" || (echo "stack not ready — run: just up" >&2; exit 1)
 
+# Smoke deploy against the prod-like compose stack.
+smoke-deploy:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    bash scripts/ops/02-compose-profile.sh prod-like up -d db redis redpanda ingestor
+    trap 'bash scripts/ops/02-compose-profile.sh prod-like down -v' EXIT
+
+    for _ in $(seq 1 60); do
+        if curl -fsS http://localhost:8000/health >/dev/null && curl -fsS http://localhost:8000/readyz >/dev/null; then
+            echo "smoke deploy passed"
+            exit 0
+        fi
+        sleep 5
+    done
+
+    echo "smoke deploy failed" >&2
+    bash scripts/ops/02-compose-profile.sh prod-like logs ingestor
+    exit 1
+
 # Wipe DB to a clean empty state: stop → remove container+volume → restart → wait.
 db-reset:
     docker compose rm -sfv ingestor db

services/ingestor/tests/conftest.py

@@ -4,5 +4,8 @@
 `conftest.py` during normal pytest collection.
 """
 
-from tests.fixtures_shared import *  # noqa: F401,F403
-from tests.fixtures_shared import _auto_provision_postgres  # noqa: F401
+from tests import fixtures_shared as shared
+
+
+globals().update({name: getattr(shared, name) for name in shared.__all__})
+__all__ = shared.__all__

services/ingestor/tests/integration/settings/test_settings_and_config_integration.py

@@ -0,0 +1,63 @@
+"""Integration tests for settings-related runtime behavior.
+
+These tests intentionally live under the integration tree because they rely on
+ASGI client/database-backed fixtures.
+"""
+
+import pytest
+from httpx import AsyncClient
+
+
+# ---------------------------------------------------------------------------
+# App Behavior with Different Settings
+# ---------------------------------------------------------------------------
+@pytest.mark.integration
+class TestAppBehaviorWithSettings:
+    """App behavior changes based on settings."""
+
+    async def test_app_includes_version_in_response(self, client: AsyncClient) -> None:
+        """App returns versioned endpoints."""
+        r = await client.get("/readyz")
+        assert r.status_code in [200, 503]
+
+
+# ---------------------------------------------------------------------------
+# Observation Fixtures Behavior
+# ---------------------------------------------------------------------------
+@pytest.mark.integration
+class TestObservationFixtures:
+    """Observation fixtures create predictable test data."""
+
+    async def test_created_observation_fixture_produces_valid_observation(
+        self, created_observation: dict
+    ) -> None:
+        """created_observation fixture produces a valid observation with expected fields."""
+        assert "id" in created_observation
+        assert "source" in created_observation
+        assert isinstance(created_observation["id"], int)
+        assert isinstance(created_observation["source"], str)
+        assert "raw_data" in created_observation or "data" in created_observation
+
+    async def test_created_observations_fixture_produces_multiple(
+        self, created_observations: list[dict]
+    ) -> None:
+        """created_observations fixture produces exactly 3 observations."""
+        assert len(created_observations) == 3
+
+        for observation in created_observations:
+            assert "id" in observation
+            assert observation["source"].startswith("source-")
+
+    async def test_observation_payload_fixture_is_mutable_copy(
+        self, observation_payload: dict
+    ) -> None:
+        """observation_payload fixture returns a mutable copy."""
+        observation_payload["source"] = "modified"
+        assert observation_payload["source"] == "modified"
+
+    async def test_created_observation_has_tags_lowercased(
+        self, created_observation: dict
+    ) -> None:
+        """Tags are normalized to lowercase (per validator)."""
+        tags = created_observation["tags"]
+        assert all(tag.islower() for tag in tags)

services/ingestor/tests/unit/settings/test_settings_and_config.py

@@ -8,7 +8,6 @@
 """
 
 import pytest
-from httpx import AsyncClient
 
 from services.ingestor.config import Settings
 
@@ -119,20 +118,6 @@ def test_partial_docs_auth_disabled(self) -> None:
         # Application logic should treat this as "auth not configured"
 
 
-# ---------------------------------------------------------------------------
-# App Behavior with Different Settings
-# ---------------------------------------------------------------------------
-@pytest.mark.integration
-class TestAppBehaviorWithSettings:
-    """App behavior changes based on settings."""
-
-    async def test_app_includes_version_in_response(self, client: AsyncClient) -> None:
-        """App returns versioned endpoints."""
-        # Make a request to verify app is functioning
-        r = await client.get("/readyz")
-        assert r.status_code in [200, 503]
-
-
 # ---------------------------------------------------------------------------
 # Environment Variable Overrides
 # ---------------------------------------------------------------------------
@@ -164,53 +149,6 @@ def test_settings_respects_case_insensitive_env_vars(self) -> None:
         # require environment variable setup
 
 
-# ---------------------------------------------------------------------------
-# Observation Fixtures Behavior
-# ---------------------------------------------------------------------------
-@pytest.mark.integration
-class TestObservationFixtures:
-    """Observation fixtures create predictable test data."""
-
-    async def test_created_observation_fixture_produces_valid_observation(
-        self, created_observation: dict
-    ) -> None:
-        """created_observation fixture produces a valid observation with expected fields."""
-        assert "id" in created_observation
-        assert "source" in created_observation
-        assert isinstance(created_observation["id"], int)
-        assert isinstance(created_observation["source"], str)
-        # raw_data field should be present (API call response)
-        assert "raw_data" in created_observation or "data" in created_observation
-
-    async def test_created_observations_fixture_produces_multiple(
-        self, created_observations: list[dict]
-    ) -> None:
-        """created_observations fixture produces exactly 3 observations."""
-        assert len(created_observations) == 3
-
-        # Each observation is valid
-        for observation in created_observations:
-            assert "id" in observation
-            assert observation["source"].startswith("source-")
-
-    async def test_observation_payload_fixture_is_mutable_copy(
-        self, observation_payload: dict
-    ) -> None:
-        """observation_payload fixture returns a mutable copy."""
-        # Should be able to modify without affecting original
-        observation_payload["source"] = "modified"
-        assert observation_payload["source"] == "modified"
-
-    async def test_created_observation_has_tags_lowercased(
-        self, created_observation: dict
-    ) -> None:
-        """Tags are normalized to lowercase (per validator)."""
-        # created_observation is from OBSERVATION_API which has ["Stock", "NASDAQ"]
-        tags = created_observation["tags"]
-        # Pydantic validator should lowercase them
-        assert all(tag.islower() for tag in tags)
-
-
 # ---------------------------------------------------------------------------
 # Settings Impact on Feature Flags
 # ---------------------------------------------------------------------------

tests/conftest.py

@@ -4,4 +4,8 @@
 for tests collected under the top-level `tests/` tree.
 """
 
-from tests.fixtures_shared import *  # noqa: F401,F403
+from tests import fixtures_shared as shared
+
+
+globals().update({name: getattr(shared, name) for name in shared.__all__})
+__all__ = shared.__all__

tests/fixtures_shared.py

@@ -88,6 +88,35 @@
 from tests.shared.payloads import OBSERVATION_API  # noqa: E402
 
 
+# Explicit shared fixture export surface for tree-level conftest re-exports.
+__all__ = [
+    "observation_timestamp",
+    "fake_redis",
+    "redis_container",
+    "real_redis",
+    "client_with_cache",
+    "_auto_provision_postgres",
+    "apply_migrations",
+    "db",
+    "client",
+    "client_isolated",
+    "test_settings",
+    "settings_with_docs_auth",
+    "settings_with_api_token",
+    "created_observation",
+    "created_observations",
+    "sample_observations_with_tags",
+    "observation_payload",
+    "postgresql_async_session",
+    "postgresql_async_session_isolated",
+    "mock_db_failure",
+    "app_with_docs_auth",
+    "app_with_api_token",
+    "pytest_configure",
+    "pytest_collection_modifyitems",
+]
+
+
 # For PostgreSQL, set pool size to match concurrent test load
 def _get_test_db_url() -> str:
     return os.environ.get("DATABASE_URL_TEST", "sqlite+aiosqlite:///:memory:")