1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/254f3e344235/ changeset: 254f3e344235 user: inithello date: 2013-03-19 21:59:27 summary: Add option to specify extra tool data for the automated install and test framework. affected #: 1 file diff -r 2d8fcb2f456caaee4ff804ea4a01893a8a3accae -r 254f3e344235d8446adf5902d2e90567f5c34d6b test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -98,6 +98,15 @@ </toolbox> ''' +# If we have a tool_data_table_conf.test.xml, set it up to be loaded when the UniverseApplication is started. +# This allows one to specify a set of tool data that is used exclusively for testing, and not loaded into any +# Galaxy instance. By default, this will be in the test-data-repo/location directory generated by buildbot_setup.sh. +if os.path.exists( 'tool_data_table_conf.test.xml' ): + additional_tool_data_tables = 'tool_data_table_conf.test.xml' + additional_tool_data_path = os.environ.get( 'GALAXY_INSTALL_TEST_EXTRA_TOOL_DATA_PATH', os.path.join( 'test-data-repo', 'location' ) ) +else: + additional_tool_data_tables = None + additional_tool_data_path = None # And set up a blank tool_data_table_conf.xml and shed_tool_data_table_conf.xml. tool_data_table_conf_xml_template = '''<?xml version="1.0"?><tables> @@ -463,6 +472,12 @@ log.info( "The embedded Galaxy application is running on %s:%s" % ( galaxy_test_host, galaxy_test_port ) ) log.info( "Repositories will be installed from the tool shed at %s" % galaxy_tool_shed_url ) success = False + # If a tool_data_table_conf.test.xml file was found, add the entries from it into the app's tool data tables. + if additional_tool_data_tables: + app.tool_data_tables.add_new_entries_from_config_file( config_filename=additional_tool_data_tables, + tool_data_path=additional_tool_data_path, + shed_tool_data_table_config=None, + persist=False ) # Initialize some variables for the summary that will be printed to stdout. repositories_tested = 0 repositories_passed = [] 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.