simplify tests

Author: nolan1999

tests/conftest.py

@@ -1,7 +1,7 @@
 import datetime
 import secrets
 import time
-from typing import Any, Generator
+from typing import Any
 from unittest.mock import MagicMock
 
 import boto3
@@ -18,16 +18,10 @@
 REGION_NAME: BucketLocationConstraintType = "eu-central-1"
 
 
-@pytest.fixture(scope="session")
-def monkeypatch_module() -> Generator[pytest.MonkeyPatch, Any, None]:
-    with pytest.MonkeyPatch.context() as mp:
-        yield mp
-
-
-@pytest.fixture(autouse=True, scope="function")
-def enqueueing_func(monkeypatch_module: pytest.MonkeyPatch) -> MagicMock:
+@pytest.fixture(autouse=True)
+def enqueueing_func(monkeypatch: pytest.MonkeyPatch) -> MagicMock:
     mock_enqueueing_function = MagicMock()
-    monkeypatch_module.setitem(
+    monkeypatch.setitem(
         app.dependency_overrides,
         enqueueing_function_dep,  # type: ignore
         lambda: mock_enqueueing_function,

tests/integration/conftest.py

@@ -28,7 +28,7 @@
 )
 from api.main import app
 from api.models import Job
-from tests.conftest import REGION_NAME, RDSTestingInstance, S3TestingBucket
+from tests.conftest import RDSTestingInstance, S3TestingBucket
 
 
 @pytest.fixture(scope="session")
@@ -109,24 +109,6 @@ def base_filesystem(
 ) -> Generator[FileSystem, Any, None]:
     if env == "local":
         base_user_dir = f"./{base_user_dir}"
-
-    monkeypatch_module.setattr(
-        settings,
-        "user_data_root_path",
-        base_user_dir,
-    )
-    monkeypatch_module.setattr(
-        settings,
-        "s3_region",
-        REGION_NAME,
-    )
-    monkeypatch_module.setattr(
-        settings,
-        "filesystem",
-        "local" if env == "local" else "s3",
-    )
-
-    if env == "local":
         shutil.rmtree(base_user_dir, ignore_errors=True)
         yield LocalFilesystem(base_user_dir)
         shutil.rmtree(base_user_dir, ignore_errors=True)