Improve database configuration in tests

Author: emyller

docker/docker-compose.local.yml

@@ -19,6 +19,7 @@ services:
       - 5432:5432
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
+      TZ: UTC
     healthcheck:
       test: pg_isready -Upostgres
       interval: 1s
@@ -33,6 +34,7 @@ services:
       - 5433:5432
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
+      TZ: UTC
     healthcheck:
       test: pg_isready -Upostgres
       interval: 1s

settings/dev.py

@@ -38,7 +38,6 @@
         ),
     ),
 }
-DATABASE_ROUTERS = ["task_processor.routers.TaskProcessorRouter"]
 TASK_PROCESSOR_DATABASES = ["default"]
 INSTALLED_APPS = [
     "django.contrib.auth",

src/task_processor/routers.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.db.models import Model
 
 
@@ -9,17 +8,10 @@ class TaskProcessorRouter:
 
     route_app_labels = ["task_processor"]
 
-    @property
-    def is_enabled(self) -> bool:
-        return "task_processor" in settings.TASK_PROCESSOR_DATABASES
-
     def db_for_read(self, model: type[Model], **hints: None) -> str | None:
         """
         If enabled, route read operations to the task processor database
         """
-        if not self.is_enabled:
-            return None
-
         if model._meta.app_label in self.route_app_labels:
             return "task_processor"
 
@@ -29,9 +21,6 @@ def db_for_write(self, model: type[Model], **hints: None) -> str | None:
         """
         If enabled, route write operations to the task processor database
         """
-        if not self.is_enabled:
-            return None
-
         if model._meta.app_label in self.route_app_labels:
             return "task_processor"
 
@@ -41,9 +30,6 @@ def allow_relation(self, obj1: Model, obj2: Model, **hints: None) -> bool | None
         """
         If enabled, allow relations between task processor models
         """
-        if not self.is_enabled:
-            return None
-
         both_objects_from_task_processor = (
             obj1._meta.app_label in self.route_app_labels
             and obj2._meta.app_label in self.route_app_labels
@@ -72,9 +58,6 @@ def allow_migrate(
         - We want to make it easier to migrate to the new database, _or back_
           to a single database setup if needed. Running DDL consistently helps.
         """
-        if not self.is_enabled:
-            return None
-
         if app_label in self.route_app_labels:
             return db in ["default", "task_processor"]
 

tests/unit/task_processor/conftest.py

@@ -7,6 +7,34 @@
 from task_processor.task_registry import RegisteredTask
 
 
+def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
+    # Parametrize marked tests to run against both databases
+    if marker := metafunc.definition.get_closest_marker("multi_database"):
+        metafunc.parametrize(
+            "database",
+            [
+                pytest.param(
+                    database,
+                    marks=pytest.mark.django_db(databases=[database], **marker.kwargs),
+                )
+                for database in ["default", "task_processor"]
+            ],
+            indirect=True,
+        )
+
+
+@pytest.fixture
+def database(
+    request: pytest.FixtureRequest,
+    settings: SettingsWrapper,
+) -> str:
+    database: str = request.param
+    settings.TASK_PROCESSOR_DATABASES = [database]
+    if database == "task_processor":
+        settings.DATABASE_ROUTERS = ["task_processor.routers.TaskProcessorRouter"]
+    return database
+
+
 @pytest.fixture()
 def task_processor_mode(settings: SettingsWrapper) -> None:
     settings.TASK_PROCESSOR_MODE = True