From 3c72c2129bd5a92e4fe0722e50e5f6d31c5d3737 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 28 Mar 2016 17:21:02 -0400 Subject: [PATCH] Move data_manager_config_file setup into driver_util. Seems it doesn't hurt tool shed tests to configure this. --- scripts/functional_tests.py | 8 +------- test/base/driver_util.py | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index 988c552a383..c2d0c4bd89f 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -47,11 +47,6 @@ def main(): start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ - default_data_manager_config = 'config/data_manager_conf.xml.sample' - for data_manager_config in ['config/data_manager_conf.xml', 'data_manager_conf.xml' ]: - if os.path.exists( data_manager_config ): - default_data_manager_config = data_manager_config - data_manager_config_file = "%s,test/functional/tools/sample_data_manager_conf.xml" % default_data_manager_config shed_tool_data_table_config = 'config/shed_tool_data_table_conf.xml' galaxy_test_tmp_dir = os.environ.get( 'GALAXY_TEST_TMP_DIR', None ) if galaxy_test_tmp_dir is None: @@ -81,8 +76,7 @@ def main(): galaxy_data_manager_data_path=galaxy_data_manager_data_path, update_integrated_tool_panel=False, enable_beta_tool_formats=True, - auto_configure_logging=logging_config_file is None, - data_manager_config_file=data_manager_config_file ) + auto_configure_logging=logging_config_file is None ) kwargs.update(galaxy_config) if datatypes_conf_override: kwargs[ 'datatypes_config_file' ] = datatypes_conf_override diff --git a/test/base/driver_util.py b/test/base/driver_util.py index a1286349095..fc172947f5d 100644 --- a/test/base/driver_util.py +++ b/test/base/driver_util.py @@ -115,6 +115,11 @@ def setup_galaxy_config( if tool_dependency_dir is None: tool_dependency_dir = tempfile.mkdtemp(dir=tmpdir, prefix="tool_dependencies") tool_data_table_config_path = _tool_data_table_config_path(default_tool_data_table_config_path) + default_data_manager_config = 'config/data_manager_conf.xml.sample' + for data_manager_config in ['config/data_manager_conf.xml', 'data_manager_conf.xml' ]: + if os.path.exists( data_manager_config ): + default_data_manager_config = data_manager_config + data_manager_config_file = "%s,test/functional/tools/sample_data_manager_conf.xml" % default_data_manager_config master_api_key = get_master_api_key() config = dict( admin_users='test@bx.psu.edu', @@ -124,6 +129,7 @@ def setup_galaxy_config( api_allow_run_as='test@bx.psu.edu', check_migrate_tools=False, cleanup_job='onsuccess', + data_manager_config_file=data_manager_config_file, file_path=file_path, id_secret='changethisinproductiontoo', job_working_directory=job_working_directory,