test: use shared postgres uri

Author: jsstevenson

tests/conftest.py

@@ -72,16 +72,16 @@ def vcr_config():
 
 
 @pytest.fixture(scope="session")
-def anyvlm_anyvar_postgres_uri():
+def anyvlm_postgres_uri():
     return environ.get(
-        "ANYVLM_ANYVAR_TEST_STORAGE_URI",
-        "postgresql://postgres:postgres@localhost:5432/anyvlm_anyvar_test",
+        "ANYVLM_TEST_STORAGE_URI",
+        "postgresql://postgres:postgres@localhost:5432/anyvlm_test",
     )
 
 
 @pytest.fixture
-def anyvar_python_client(anyvlm_anyvar_postgres_uri: str) -> PythonAnyVarClient:
-    storage = create_storage(anyvlm_anyvar_postgres_uri)
+def anyvar_python_client(anyvlm_postgres_uri: str) -> PythonAnyVarClient:
+    storage = create_storage(anyvlm_postgres_uri)
     storage.wipe_db()
     translator = create_translator()
     return PythonAnyVarClient(translator, storage)
@@ -101,14 +101,6 @@ def anyvar_populated_python_client(
     return anyvar_python_client
 
 
-@pytest.fixture(scope="session")
-def anyvlm_postgres_uri():
-    return environ.get(
-        "ANYVLM_TEST_STORAGE_URI",
-        "postgresql://postgres:postgres@localhost:5432/anyvlm_test",
-    )
-
-
 @pytest.fixture
 def postgres_storage(anyvlm_postgres_uri: str):
     """Reset storage state after each test case"""

tests/unit/anyvar/test_clients.py

@@ -16,9 +16,9 @@
 
 
 @pytest.fixture
-def anyvar_http_client(anyvlm_anyvar_postgres_uri: str) -> HttpAnyVarClient:
+def anyvar_http_client(anyvlm_postgres_uri: str) -> HttpAnyVarClient:
     """Create test fixture for AnyVar HTTP client"""
-    storage = create_storage(anyvlm_anyvar_postgres_uri)
+    storage = create_storage(anyvlm_postgres_uri)
     storage.wipe_db()
     return HttpAnyVarClient()