# HG changeset patch
# User Johannes Bornhold <johannes@rhodecode.com>
# Date 2016-06-07 08:26:08
# Node ID 25511505e5aa352b63dda89bb0cde04c68de981f
# Parent  0652b43fd39f0457f12a28d1d82506397439e234

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.

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -165,14 +165,15 @@ def make_pyramid_app(global_config, **se
     config = Configurator(settings=settings)
     add_pylons_compat_data(config.registry, global_config, settings_pylons)
 
+    # 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)
 
-    # If this is a test run we prepare the test environment like
-    # creating a test database, test search index and test repositories.
-    if settings['is_test']:
-        utils.initialize_test_environment(settings_merged)
-
     includeme(config)
     includeme_last(config)
     pyramid_app = config.make_wsgi_app()