Parametrize database *configurations*, put connection params in env to parametrize api tests

Author: akaIDIOT

citatio/tests/conftest.py

@@ -2,8 +2,10 @@
 from os import environ
 from pathlib import Path
 
+import asyncpg
 import numpy as np
 import pytest
+from confidence import Configuration
 from testcontainers.postgres import PostgresContainer
 
 from citatio.db import PostgreSQLDatabase, SQLiteDatabase
@@ -81,16 +83,50 @@ def connect_pgvector(request, monkeypatch):
         pytest.param('postgresql', marks=pytest.mark.postgresql),
     ]
 )
-async def database(request):
+async def database_config(request):
     match request.param:
         case 'sqlite':
-            # create an in-memory database that will be empty after use by design
-            async with await SQLiteDatabase.connect(':memory:') as db:
-                yield db
+            # use a in-memory sqlite database
+            yield Configuration({'database.sqlite': ':memory:'})
         case 'postgresql':
-            # request pgvector connection settings from a named fixture
-            # (a pytest.param cannot use pytest.mark.usefixtures, it seems)
+            # run a session-scope ephemeral database
             connect = request.getfixturevalue('connect_pgvector')
+            yield Configuration({'database': connect})
+
+
+@pytest.fixture
+async def database_env(monkeypatch, database_config):
+    match database_config:
+        case {'database.sqlite': ':memory:'}:
+            # NB: add quotes to avoid the configuration's format misparsing :memory:
+            monkeypatch.setenv('CITATIO_DATABASE_SQLITE', '":memory:"')
+            yield
+        case {'database.sqlite': fname}:
+            monkeypatch.setenv('CITATIO_DATABASE_SQLITE', fname)
+            yield
+        case {'database': connect}:
+            for var, value in connect.items():
+                monkeypatch.setenv(f'CITATIO_DATABASE_{var}'.upper(), str(value))
+            yield
+            # empty the database after use
+            connection = await asyncpg.connect(**connect)
+            await connection.execute("""
+                DELETE FROM labels;
+                DELETE FROM functions;
+            """)
+            await connection.close()
+        case _:
+            raise ValueError
+
+
+@pytest.fixture
+async def database(database_config):
+    match database_config:
+        case {'database.sqlite': name}:
+            # create an in-memory database that will be empty after use by design
+            async with await SQLiteDatabase.connect(name) as db:
+                yield db
+        case {'database': connect}:
             async with await PostgreSQLDatabase.connect(**connect) as db:
                 yield db
                 # empty the database after use

citatio/tests/test_api.py

@@ -1,27 +1,16 @@
 import os
 
-import asyncpg
 import pytest
 from fastapi.testclient import TestClient
 
 from citatio.api import app
 
 
-pytestmark = pytest.mark.postgresql
-
-
 @pytest.fixture
-async def client(connect_pgvector):
+async def client(database_env):
     with TestClient(app) as client:
         yield client
 
-    # after the test (post-yield), make sure to empty the tables that we might have inserted into during the test
-    connection = await asyncpg.connect(**connect_pgvector)
-    await connection.execute("""
-        DELETE FROM labels;
-        DELETE FROM functions;
-    """)
-
 
 @pytest.mark.skipif(os.environ.get('CI') == 'true', reason="don't run this test on CI")
 def test_add_function(client, functions):