From 98d8c2cc2e227ad81145c7013d210607d18fbfa4 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 18 May 2015 02:05:20 -0400 Subject: [PATCH] Allow config of shed tool conf used with ``run_tests.sh -installed``. Set with GALAXY_TEST_SHED_TOOL_CONF. This is required to implement galaxyproject/planemo#176. --- scripts/functional_tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index de56a42b1c3..98d22f1f9c6 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -74,7 +74,10 @@ default_galaxy_test_port_max = 9999 default_galaxy_locales = 'en' default_galaxy_test_file_dir = "test-data,https://github.com/galaxyproject/galaxy-test-data.git" migrated_tool_panel_config = 'config/migrated_tools_conf.xml' -installed_tool_panel_configs = [ 'config/shed_tool_conf.xml' ] +installed_tool_panel_configs = [ + os.environ.get('GALAXY_TEST_SHED_TOOL_CONF', 'config/shed_tool_conf.xml') +] + # should this serve static resources (scripts, images, styles, etc.) STATIC_ENABLED = True