Less from init, more from generalresearch, basic db test from shared conftest

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 002aced..457f6a3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -22,6 +22,7 @@ if TYPE_CHECKING:
 
 
 pytest_plugins = [
+    "test_utils.conftest",
     "tests.fixtures.amt",
     "tests.fixtures.flow",
     "tests.fixtures.http",
@@ -83,7 +84,7 @@ def pe_id() -> str:
 
 
 @pytest.fixture(scope="session")
-def settings() -> "Settings":
+def settings() -> Settings:
     from jb.settings import Settings as JBSettings
 
     return JBSettings()
@@ -176,7 +177,7 @@ def django_db_factory(
 
 
 @pytest.fixture(scope="session")
-def pg_config(settings: "Settings") -> PostgresConfig:
+def pg_config(settings: Settings) -> PostgresConfig:
     return PostgresConfig(
         dsn=settings.amt_jb_db,
         connect_timeout=1,
@@ -188,7 +189,7 @@ def pg_config(settings: "Settings") -> PostgresConfig:
 
 
 @pytest.fixture(scope="session")
-def redis(settings: "Settings"):
+def redis(settings: Settings):
     from generalresearch.redis_helper import RedisConfig
 
     redis_config = RedisConfig(
@@ -202,7 +203,7 @@ def redis(settings: "Settings"):
 
 # --- Connectors ---
 @pytest.fixture(scope="session")
-def amt_client(settings: "Settings") -> MTurkClient:
+def amt_client(settings: Settings) -> MTurkClient:
     import boto3
 
     client = boto3.client(