actually fix the thing

Author: khvn26

api/app/settings/common.py

@@ -79,6 +79,7 @@
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
+    "django.contrib.postgres",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
     "rest_framework",

api/conftest.py

@@ -14,9 +14,6 @@
 )
 from common.projects.permissions import VIEW_PROJECT
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.signals import (
-    register_type_handlers,
-)
 from django.core.cache import caches
 from django.db.backends.base.creation import TEST_DATABASE_PREFIX
 from django.test.utils import setup_databases
@@ -25,7 +22,6 @@
 from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource, Table
 from pyfakefs.fake_filesystem import FakeFilesystem
 from pytest import FixtureRequest
-from pytest_django import DjangoDbBlocker
 from pytest_django.fixtures import SettingsWrapper
 from pytest_django.plugin import blocking_manager_key
 from pytest_mock import MockerFixture
@@ -162,10 +158,7 @@ def fs(fs: FakeFilesystem) -> FakeFilesystem:
 
 
 @pytest.fixture(scope="session")
-def django_db_setup(
-    request: pytest.FixtureRequest,
-    django_db_blocker: DjangoDbBlocker,
-) -> None:
+def django_db_setup(request: pytest.FixtureRequest) -> None:
     if (
         request.config.option.ci
         # xdist worker id is either `gw[0-9]+` or `master`
@@ -174,28 +167,15 @@ def django_db_setup(
         # Django's test database clone indices start at 1,
         # Pytest's worker indices are 0-based
         test_db_suffix = str(int(xdist_worker_id_suffix) + 1)
-
-        from django.conf import settings
-
-        for db_settings in settings.DATABASES.values():
-            test_db_name = (
-                f"{TEST_DATABASE_PREFIX}{db_settings['NAME']}_{test_db_suffix}"
-            )
-            db_settings["NAME"] = test_db_name
-
     else:
         # Tests are run on main node, which assumes -n0
-        request.getfixturevalue("django_db_setup")  # pragma: no cover
+        return request.getfixturevalue("django_db_setup")  # type: ignore[no-any-return] # pragma: no cover
 
-    if request.config.option.ci or request.config.getoption("reuse_db"):
-        from django.db import connections
+    from django.conf import settings
 
-        # Ensure psycopg type handlers are registered.
-        # This is necessary for tests that involve `HStoreField`.
-        for connection in connections.all():
-            if connection.vendor == "postgresql":
-                with django_db_blocker.unblock():
-                    register_type_handlers(connection)
+    for db_settings in settings.DATABASES.values():
+        test_db_name = f"{TEST_DATABASE_PREFIX}{db_settings['NAME']}_{test_db_suffix}"
+        db_settings["NAME"] = test_db_name
 
 
 @pytest.fixture(autouse=True)