Fix unit tests after removing get_tool_id

This commit is contained in:
mvdbeek
2021-06-10 08:53:49 +02:00
parent da63a513f9
commit f6f4c7e6b7
2 changed files with 5 additions and 9 deletions
+5 -5
View File
@@ -389,17 +389,17 @@ class ToolBoxTestCase(BaseToolBoxTestCase):
assert section_by_label is section
assert tool_panel_section_key == 'tid'
def test_get_tool_id(self):
def test_get_tool(self):
self._init_tool()
self._setup_two_versions_in_config()
self._setup_two_versions()
assert self.toolbox.get_tool_id("test_tool") in [
assert self.toolbox.get_tool("test_tool").id in [
"github.com/galaxyproject/example/test_tool/0.1",
"github.com/galaxyproject/example/test_tool/0.2"
]
assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.1") == "github.com/galaxyproject/example/test_tool/0.1"
assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.2") == "github.com/galaxyproject/example/test_tool/0.2"
assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.3") != "github.com/galaxyproject/example/test_tool/0.3"
assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.1").id == "github.com/galaxyproject/example/test_tool/0.1"
assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.2").id == "github.com/galaxyproject/example/test_tool/0.2"
assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.3").id != "github.com/galaxyproject/example/test_tool/0.3"
def test_tool_dir(self):
self._init_tool()
-4
View File
@@ -75,10 +75,6 @@ class TestToolbox:
# Real tool box returns None of missing tool also
return self.tools.get(tool_id, None)
def get_tool_id(self, tool_id):
tool = self.get_tool(tool_id)
return tool and tool.id
def yaml_to_model(has_dict, id_offset=100):
if isinstance(has_dict, str):