From be0107b6204b5b47b9c6e8ea3196a893d4409c05 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 28 Mar 2016 13:06:55 -0400 Subject: [PATCH] Simplify test tool_data_table_config logic. Added with https://github.com/galaxyproject/galaxy/commit/246ea04cc7ee1d0d470a514302bf2623f845ed8f. --- scripts/functional_tests.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index a4bb7688dfb..93d73d2b815 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -112,17 +112,13 @@ def main(): start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ tool_data_table_config_path = None - if os.path.exists( 'tool_data_table_conf.test.xml' ): - # If explicitly defined tables for test, use those. - tool_data_table_config_path = 'tool_data_table_conf.test.xml' - else: - # ... otherise find whatever Galaxy would use as the default and - # the sample data for fucntional tests to that. - default_tool_data_config = 'config/tool_data_table_conf.xml.sample' - for tool_data_config in ['config/tool_data_table_conf.xml', 'tool_data_table_conf.xml' ]: - if os.path.exists( tool_data_config ): - default_tool_data_config = tool_data_config - tool_data_table_config_path = '%s,test/functional/tool-data/sample_tool_data_tables.xml' % default_tool_data_config + # ... otherise find whatever Galaxy would use as the default and + # the sample data for fucntional tests to that. + default_tool_data_config = 'config/tool_data_table_conf.xml.sample' + for tool_data_config in ['config/tool_data_table_conf.xml', 'tool_data_table_conf.xml' ]: + if os.path.exists( tool_data_config ): + default_tool_data_config = tool_data_config + tool_data_table_config_path = '%s,test/functional/tool-data/sample_tool_data_tables.xml' % default_tool_data_config default_data_manager_config = 'config/data_manager_conf.xml.sample' for data_manager_config in ['config/data_manager_conf.xml', 'data_manager_conf.xml' ]: