From 544b7b47a16cff8a140e2e89784b7d6ad8a31286 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 24 Mar 2016 17:12:16 -0700 Subject: [PATCH] Fix tests post-alembic-migration-changes. * mediagoblin/init/__init__.py (setup_database): Update to run alembic migrations, skip the old legacy migrations. --- mediagoblin/init/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index 38ec1260..05a26792 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -70,10 +70,16 @@ def setup_database(app): # Set up the database db = setup_connection_and_db_from_config( app_config, run_migrations, app=app) + # run_migrations is used for tests if run_migrations: - #Run the migrations to initialize/update the database. - from mediagoblin.gmg_commands.dbupdate import run_all_migrations - run_all_migrations(db, app_config, global_config) + # Run the migrations to initialize/update the database. + # We only run the alembic migrations in the case of unit + # tests, in which case we don't need to run the legacy + # migrations. + from mediagoblin.gmg_commands.dbupdate import ( + run_alembic_migrations, run_foundations) + run_alembic_migrations(db, app_config, global_config) + run_foundations(db, global_config) else: check_db_migrations_current(db) -- 2.25.1