1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0f70d302b85e/ Changeset: 0f70d302b85e Branch: stable User: davebgx Date: 2014-10-09 18:17:33+00:00 Summary: More flexibility for tool data table configuration in the install and test framework. Affected #: 1 file diff -r 9bb2f032a455f0e63f407b396027102679d619ee -r 0f70d302b85e2a74d6c0c9ec7d4ccc6f11787eac test/install_and_test_tool_shed_repositories/base/util.py --- a/test/install_and_test_tool_shed_repositories/base/util.py +++ b/test/install_and_test_tool_shed_repositories/base/util.py @@ -115,13 +115,16 @@ additional_tool_data_tables = None additional_tool_data_path = None -# Set up default tool data tables. -if os.path.exists( 'tool_data_table_conf.xml' ): - tool_data_table_conf = 'tool_data_table_conf.xml' -elif os.path.exists( 'tool_data_table_conf.xml.sample' ): - tool_data_table_conf = 'tool_data_table_conf.xml.sample' -else: - tool_data_table_conf = None +tool_data_table_conf = None +# Set up default tool data tables. If a non-sample version is in config/, use that. Otherwise iterate through lower +# priority versions. +for conf in [ 'config/tool_data_table_conf.xml', + 'config/tool_data_table_conf.xml.sample', + 'tool_data_table_conf.xml', + 'tool_data_table_conf.xml.sample' ]: + if os.path.exists( conf ): + tool_data_table_conf = conf + break # The GALAXY_INSTALL_TEST_TOOL_SHED_URL and GALAXY_INSTALL_TEST_TOOL_SHED_API_KEY environment variables must be # set for this script to work correctly. If the value of GALAXY_INSTALL_TEST_TOOL_SHED_URL does not refer to one Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.