From 9b30f6c8395870ba384f306c143bef45f4d740e8 Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Wed, 27 Feb 2013 14:12:07 -0500 Subject: [PATCH] Attempt to resolve issue with tool shed registry when running buildbot functional tests. --- scripts/functional_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py index dfa5e1b3af3..89178099657 100644 --- a/scripts/functional_tests.py +++ b/scripts/functional_tests.py @@ -314,6 +314,7 @@ def main(): log.info( "Functional tests will be run against %s:%s" % ( galaxy_test_host, galaxy_test_port ) ) success = False try: + tool_configs = app.config.tool_configs # What requires these? Handy for (eg) functional tests to save outputs? if galaxy_test_save: os.environ[ 'GALAXY_TEST_SAVE' ] = galaxy_test_save @@ -337,7 +338,6 @@ def main(): # Eliminate the migrated_tool_panel_config from the app's tool_configs, append the list of installed_tool_panel_configs, # and reload the app's toolbox. relative_migrated_tool_panel_config = os.path.join( app.config.root, migrated_tool_panel_config ) - tool_configs = app.config.tool_configs if relative_migrated_tool_panel_config in tool_configs: tool_configs.remove( relative_migrated_tool_panel_config ) for installed_tool_panel_config in installed_tool_panel_configs: