From c58dd1646e408c387ffc5bbc00e8afb46b25ff69 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Tue, 7 Jun 2016 10:26:08 +0200 Subject: [PATCH] db: Change ordering of test env setup and db connection init. - DB init sets rhodecode.model.db.ENCRYPTION_KEY - Test env setup resets rhodecode.model.db.ENCRYPTION_KEY to None - Therefore DB init has to be done after test env setup. --- rhodecode/config/middleware.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index b9a20884..9a92eafd 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -165,14 +165,15 @@ def make_pyramid_app(global_config, **settings): config = Configurator(settings=settings) add_pylons_compat_data(config.registry, global_config, settings_pylons) - # Initialize the database connection. - utils.initialize_database(settings_merged) - # If this is a test run we prepare the test environment like # creating a test database, test search index and test repositories. + # This has to be done before the database connection is initialized. if settings['is_test']: utils.initialize_test_environment(settings_merged) + # Initialize the database connection. + utils.initialize_database(settings_merged) + includeme(config) includeme_last(config) pyramid_app = config.make_wsgi_app()