From df48d33a8f5d3dbb104096c126d7fdaf1950f213 Mon Sep 17 00:00:00 2001
From: SerRichard <seanhoyal@gmail.com>
Date: Wed, 29 May 2024 08:59:07 +0200
Subject: [PATCH] accept reformatting

---
 tests/api/test_api.py | 13 +++++++++++--
 tests/conftest.py     |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/api/test_api.py b/tests/api/test_api.py
index f825695..7dc6d29 100644
--- a/tests/api/test_api.py
+++ b/tests/api/test_api.py
@@ -322,6 +322,9 @@ def my_new_cool_auth():
     assert response.json()["user_id"] == str(specific_uuid)
 
 
+@pytest.mark.skip(
+    reason="Can only be run independently, as it revisions the database and will break the tests which run after."
+)
 def test_extending_the_usermodel(
     mocked_oidc_config, mocked_oidc_userinfo, core_api, app_settings
 ):
@@ -345,8 +348,10 @@ class ExtendedUserORM(UserORM):
     os.chdir(Path(ALEMBIC_DIR))
     alembic_cfg = Config("alembic.ini")
 
-    command.revision(alembic_cfg, f"openeo-fastapi-extended", autogenerate=True)
-    command.upgrade(alembic_cfg, "head")
+    command.revision(
+        alembic_cfg, f"openeo-fastapi-extended", rev_id="downgrademe", autogenerate=True
+    )
+    command.upgrade(alembic_cfg, revision="downgrademe")
 
     test_app = TestClient(core_api.app)
 
@@ -366,4 +371,8 @@ def my_new_cool_auth():
         headers={"Authorization": "Bearer /oidc/egi/not-real"},
     )
 
+    # Downgrade to remove the use of the ExtendedUserORM
+    # Doesnt seem to work
+    command.downgrade(alembic_cfg, revision="downgrademe")
+
     assert response.status_code == 200
diff --git a/tests/conftest.py b/tests/conftest.py
index 996e6e5..8968238 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -53,7 +53,7 @@ def app_settings():
     return settings.AppSettings(**SETTINGS_DICT)
 
 
-@pytest.fixture()
+@pytest.fixture(scope="function")
 def core_api():
     formats = [
         FileFormat(
@@ -189,7 +189,7 @@ def mocked_issuer():
     )
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture(scope="function", autouse=True)
 def mock_engine(postgresql):
     """Postgresql engine for SQLAlchemy."""
     import os