package-scoped fixtures to have correct cleanup

Author: nolan1999

tests/integration/conftest.py

@@ -18,23 +18,23 @@
 from workerfacing_api.main import workerfacing_app
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def test_username() -> str:
     return "test_user"
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def base_dir() -> str:
     return "int_test_dir"
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def internal_api_key_secret() -> str:
     return "test_internal_api_key"
 
 
 @pytest.fixture(
-    scope="session",
+    scope="package",
     params=["local", pytest.param("aws", marks=pytest.mark.aws)],
 )
 def env(
@@ -52,7 +52,7 @@ def env(
         s3_testing_bucket.cleanup()
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def base_filesystem(
     env: str,
     base_dir: str,
@@ -89,7 +89,7 @@ def base_filesystem(
         raise NotImplementedError
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def queue(
     env: str,
     rds_testing_instance: RDSTestingInstance,
@@ -106,7 +106,7 @@ def queue(
     queue.delete()
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="package", autouse=True)
 def override_filesystem_dep(
     base_filesystem: FileSystem, monkeypatch_module: pytest.MonkeyPatch
 ) -> None:
@@ -117,7 +117,7 @@ def override_filesystem_dep(
     )
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="package", autouse=True)
 def override_queue_dep(
     queue: RDSJobQueue, monkeypatch_module: pytest.MonkeyPatch
 ) -> None:
@@ -128,7 +128,7 @@ def override_queue_dep(
     )
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="package", autouse=True)
 def override_auth(monkeypatch_module: pytest.MonkeyPatch, test_username: str) -> None:
     monkeypatch_module.setitem(
         workerfacing_app.dependency_overrides,  # type: ignore
@@ -143,7 +143,7 @@ def override_auth(monkeypatch_module: pytest.MonkeyPatch, test_username: str) ->
     )
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="package", autouse=True)
 def override_internal_api_key_secret(
     monkeypatch_module: pytest.MonkeyPatch, internal_api_key_secret: str
 ) -> str:

tests/integration/endpoints/test_jobs.py

@@ -28,17 +28,17 @@
 from workerfacing_api.schemas.rds_models import JobStates
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def app() -> AppSpecs:
     return AppSpecs(cmd=["cmd"], env={"env": "var"})
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def handler() -> HandlerSpecs:
     return HandlerSpecs(image_url="u", files_up={"output": "out"})
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="package")
 def paths_upload(
     env: str, test_username: str, base_filesystem: FileSystem
 ) -> PathsUploadSpecs:
@@ -56,7 +56,7 @@ def paths_upload(
 class TestJobs(_TestEndpoint):
     endpoint = "/jobs"
 
-    @pytest.fixture(scope="session")
+    @pytest.fixture(scope="package")
     def passing_params(self) -> list[EndpointParams]:
         return [EndpointParams("get", params={"memory": 1})]