Avoid calling db.init_app twice

bcollazo · Mar 19, 2023 · 9614ee4 · 9614ee4
1 parent e0081ae
commit 9614ee4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/catanatron_server/catanatron_server/__init__.py b/catanatron_server/catanatron_server/__init__.py
@@ -25,8 +25,8 @@ def create_app(test_config=None):
     # ===== Initialize Database
     from catanatron_server.models import db
 
-    db.init_app(app)
     with app.app_context():
+        db.init_app(app)
         db.create_all()
 
     # ===== Initialize Routes

diff --git a/tests/integration_tests/test_server.py b/tests/integration_tests/test_server.py
@@ -11,11 +11,6 @@ def app():
     # create the app with common test config
     app = create_app({"TESTING": True, "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:"})
 
-    # create the database and load test data
-    with app.app_context():
-        db.init_app(app)
-        db.create_all()
-
     yield app