Merge pull request #3508 from jmchilton/conda_mapping_test_fix

Fix integration test for default Conda mapping.

lib/galaxy/tools/deps/requirements.py

@@ -1,5 +1,7 @@
 import copy
 
+import six
+
 from galaxy.util import (
     asbool,
     xml_text,
@@ -11,6 +13,7 @@ DEFAULT_REQUIREMENT_TYPE = "package"
 DEFAULT_REQUIREMENT_VERSION = None
 
 
+@six.python_2_unicode_compatible
 class ToolRequirement( object ):
     """
     Represents an external requirement that must be available for the tool to
@@ -47,6 +50,11 @@ class ToolRequirement( object ):
     def __hash__(self):
         return hash((self.name, self.type, self.version, frozenset(self.specs)))
 
+    def __str__(self):
+        return "ToolRequirement[%s,version=%s,type=%s,specs=%s]" % (self.name, self.version, self.type, self.specs)
+
+    __repr__ = __str__
+
 
 class RequirementSpecification(object):
     """Refine a requirement using a URI."""

test/integration/test_resolvers.py

@@ -77,10 +77,15 @@ class CondaResolutionIntegrationTestCase(integration_util.IntegrationTestCase):
     def test_legacy_r_mapping( self ):
         """
         """
+        tool_id = "legacy_R"
         dataset_populator = DatasetPopulator(self.galaxy_interactor)
         history_id = dataset_populator.new_history()
+        endpoint = "tools/%s/install_dependencies" % tool_id
+        data = {'id': tool_id}
+        create_response = self._post(endpoint, data=data, admin=True)
+        self._assert_status_code_is( create_response, 200 )
         payload = dataset_populator.run_tool_payload(
-            tool_id="legacy_R",
+            tool_id=tool_id,
             inputs={},
             history_id=history_id,
         )