Merge API GalaxyInteractorTestCase into integration test

This seems more appropraite as an integration test.

lib/galaxy_test/driver/integration_util.py

@@ -184,9 +184,9 @@ def integration_module_instance(clazz):
     return pytest.fixture(scope='module')(_instance)
 
 
-def integration_tool_runner(tool_ids, tool_version=None):
+def integration_tool_runner(tool_ids):
 
     def test_tools(instance, tool_id):
-        instance._run_tool_test(tool_id, tool_version=tool_version)
+        instance._run_tool_test(tool_id)
 
     return pytest.mark.parametrize("tool_id", tool_ids)(test_tools)

test/functional/tools/multiple_versions_v01.xml

@@ -1,7 +1,7 @@
 <tool id="multiple_versions" name="multiple_versions" version="0.1">
-    <command>
-        echo "Version 0.1" > $out_file1
-    </command>
+    <command><![CDATA[
+        echo "Version 0.1" > '$out_file1'
+    ]]></command>
     <inputs>
         <param name="inttest" value="1" type="integer" />
     </inputs>

test/functional/tools/multiple_versions_v02.xml

@@ -1,7 +1,7 @@
 <tool id="multiple_versions" name="multiple_versions" version="0.2">
-    <command>
-        echo "Version 0.2" &gt; $out_file1
-    </command>
+    <command><![CDATA[
+        echo "Version 0.2" > '$out_file1'
+    ]]></command>
     <inputs>
         <param name="inttest" value="1" type="integer"/>
     </inputs>

test/integration/test_galaxy_interactor.py

@@ -1,22 +1,22 @@
-# Test galaxy interactor
+"""Integration tests for GalaxyInteractor."""
 
 from packaging.version import Version
 
-from galaxy_test.base.populators import skip_without_tool
-from ._framework import ApiTestCase
+from galaxy_test.driver import integration_util
 
 
-class GalaxyInteractorBackwardCompatTestCase(ApiTestCase):
+class GalaxyInteractorTestCase(integration_util.IntegrationTestCase):
+
+    framework_tool_and_types = True
 
     def test_local_test_data_download(self):
         self.galaxy_interactor._target_galaxy_version = Version("18.09")
         assert self.galaxy_interactor.supports_test_data_download is False
         assert self.galaxy_interactor.test_data_download(tool_id='cat1', filename='1.bed').startswith(b'chr1\t147962192\t147962580')
 
+    def test_run_test_select_version(self):
+        self._run_tool_test(tool_id='multiple_versions', tool_version="0.1")
 
-class GalaxyInteractorTestCase(ApiTestCase):
-
-    @skip_without_tool("multiple_versions")
     def test_get_tool_tests(self):
         # test that get_tool_tests will return the right tests when the tool_version has a '+' in it
         test_data = self.galaxy_interactor.get_tool_tests(tool_id="multiple_versions", tool_version="0.1+galaxy6")

test/integration/test_galaxy_interactor_verify.py

@@ -1,13 +0,0 @@
-"""Integration tests for the Pulsar embedded runner."""
-
-from galaxy_test.driver import integration_util
-
-
-class ToolTestIntegrationInstance(integration_util.IntegrationInstance):
-    """Describe a Galaxy test instance with embedded pulsar configured."""
-
-    framework_tool_and_types = True
-
-instance = integration_util.integration_module_instance(ToolTestIntegrationInstance)
-
-test_tools = integration_util.integration_tool_runner(['multiple_versions'], tool_version='0.1')