1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3f42dfab2cee/ Changeset: 3f42dfab2cee User: davebgx Date: 2014-10-13 20:07:29+00:00 Summary: Additional fixes for install and test framework. Affected #: 2 files diff -r 67050bf7b3cff0e482bd6ed15b286864ffc77ae5 -r 3f42dfab2cee4706551c9ca0211e7cd08e35058b 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 @@ -118,7 +118,8 @@ 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', +for conf in [ 'tool_data_table_conf.test.xml', + 'config/tool_data_table_conf.xml', 'config/tool_data_table_conf.xml.sample', 'tool_data_table_conf.xml', 'tool_data_table_conf.xml.sample' ]: diff -r 67050bf7b3cff0e482bd6ed15b286864ffc77ae5 -r 3f42dfab2cee4706551c9ca0211e7cd08e35058b test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py @@ -332,13 +332,14 @@ template_path = "templates", tool_config_file = ','.join( [ galaxy_tool_conf_file, galaxy_shed_tool_conf_file ] ), tool_data_path = tool_data_path, - tool_data_table_config_path = galaxy_tool_data_table_conf_file, tool_dependency_dir = tool_dependency_dir, tool_path = tool_path, tool_parse_help = False, tool_sheds_config_file = galaxy_tool_sheds_conf_file, update_integrated_tool_panel = False, use_heartbeat = False ) + if os.path.exists( galaxy_tool_data_table_conf_file ): + kwargs[ 'tool_data_table_config_path' ] = galaxy_tool_data_table_conf_file galaxy_config_file = os.environ.get( 'GALAXY_INSTALL_TEST_INI_FILE', None ) # If the user has passed in a path for the .ini file, do not overwrite it. if not galaxy_config_file: 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.