Make functional tests explicitly specify which shed tool config to use.

test/tool_shed/base/twilltestcase.py

@@ -28,6 +28,7 @@ class ShedTwillTestCase( TwillTestCase ):
         self.file_dir = os.environ.get( 'TOOL_SHED_TEST_FILE_DIR', None )
         self.tool_shed_test_file = None
         self.tool_data_path = os.environ.get( 'GALAXY_TEST_TOOL_DATA_PATH' )
+        self.shed_tool_conf = os.environ.get( 'GALAXY_TEST_SHED_TOOL_CONF' )
         # TODO: Figure out a way to alter these attributes during tests.
         self.galaxy_tool_dependency_dir = None # os.environ.get( 'GALAXY_TEST_TOOL_DEPENDENCY_DIR' )
         self.shed_tools_dict = {}
@@ -431,6 +432,8 @@ class ShedTwillTestCase( TwillTestCase ):
                 checkbox.selected = True
             else:
                 checkbox.selected = False
+        if 'shed_tool_conf' not in kwd:
+            kwd[ 'shed_tool_conf' ] = self.shed_tool_conf
         self.submit_form( 1, 'select_tool_panel_section_button', **kwd )
         self.initiate_installation_process()
         self.wait_for_repository_installation( repository, changeset_revision )

test/tool_shed/functional_tests.py

@@ -256,6 +256,7 @@ def main():
         shed_tool_conf_template_parser = string.Template( shed_tool_conf_xml_template )
         shed_tool_conf_xml = shed_tool_conf_template_parser.safe_substitute( shed_tool_path=galaxy_shed_tool_path )
         file( galaxy_shed_tool_conf_file, 'w' ).write( shed_tool_conf_xml )
+        os.environ[ 'GALAXY_TEST_SHED_TOOL_CONF' ] = galaxy_shed_tool_conf_file
     
         # ---- Build Galaxy Application -------------------------------------------------- 
         galaxy_global_conf = { '__file__' : 'universe_wsgi.ini.sample' }