From 871c301e35bb938e8d3cd515e18851cc2779e939 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Wed, 8 Jan 2014 14:50:19 -0500 Subject: [PATCH] Allow specifying the functional tests' install_database_connection with an environment variable. --- scripts/functional_tests.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index 9cb9f281bec..995783004ef 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -313,6 +313,7 @@ def main(): file_path = os.path.join( galaxy_db_path, 'files' ) new_file_path = tempfile.mkdtemp( prefix='new_files_path_', dir=tempdir ) job_working_directory = tempfile.mkdtemp( prefix='job_working_directory_', dir=tempdir ) + install_database_connection = os.environ.get( 'GALAXY_TEST_INSTALL_DBURI', None ) if 'GALAXY_TEST_DBURI' in os.environ: database_connection = os.environ['GALAXY_TEST_DBURI'] else: @@ -372,6 +373,8 @@ def main(): user_library_import_dir=user_library_import_dir, master_api_key=master_api_key, ) + if install_database_connection is not None: + kwargs[ 'install_database_connection' ] = install_database_connection if psu_production: kwargs[ 'global_conf' ] = None if not database_connection.startswith( 'sqlite://' ):