opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move data_manager_config_file setup into driver_util.

Browse Source 
Seems it doesn't hurt tool shed tests to configure this.
This commit is contained in:
John Chilton
2016-03-29 08:04:26 -04:00
parent 1b80e6e8d1
commit 3c72c2129b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+1 -7
View File
@@ -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
test/base/driver_util.py
+6
View File
@@ -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,