improve pytest setup

Author: brosner

tests/conftest.py

@@ -1,29 +1,37 @@
 import pytest
-from flask import Flask, g
+from flask import Flask, current_app, g
 from flask.testing import FlaskClient
 
 from teufa import db as dbm
 from teufa.app import create_app
 from teufa.ext import db
 
 
-@pytest.fixture
-def app():
+def pytest_configure():
     app = create_app()
-    with app.app_context():
-        dbm.Base.metadata.create_all(db.engine)
+    app.app_context().push()
+
+
+def create_default_tenant():
+    tenant = dbm.Tenant(
+        name="Default",
+        hostname="localhost",
+    )
+    db.session.add(tenant)
+    db.session.commit()
 
-        tenant = dbm.Tenant(
-            name="Default",
-            hostname="localhost",
-        )
-        db.session.add(tenant)
-        db.session.commit()
-        g.tenant = tenant
+    g.tenant = tenant
+
+
+@pytest.fixture
+def app():
+    dbm.Base.metadata.create_all(db.engine)
 
-        yield app
+    with current_app.app_context():
+        create_default_tenant()
+        yield current_app
 
-        dbm.Base.metadata.drop_all(db.engine)
+    dbm.Base.metadata.drop_all(db.engine)
 
 
 @pytest.fixture

teufa/app.py

@@ -15,11 +15,10 @@ def create_app():
 
     @app.before_request
     def before_request():
-        if not hasattr(g, "tenant"):
-            hostname = request.host.split(":")[0]
-            g.tenant = db.session.scalars(
-                select(dbm.Tenant).filter_by(hostname=hostname).limit(1)
-            ).first()
+        hostname = request.host.split(":")[0]
+        g.tenant = db.session.scalars(
+            select(dbm.Tenant).filter_by(hostname=hostname).limit(1)
+        ).first()
 
     @app.teardown_request
     def teardown_request(exc):