Update tool tests to reflect get_tool is non-deterministic...

... if supplied a short id instead of a GUID and there are multiple versions of a shed tool with the same short id installed.
This commit is contained in:
John Chilton
2015-05-06 14:06:16 -04:00
parent a15a2bd2b2
commit bc48ac15d5
+6 -2
View File
@@ -194,7 +194,8 @@ class ToolBoxTestCase( BaseToolBoxTestCase ):
assert test_tool.tool_shed == "github.com"
assert test_tool.repository_owner == "galaxyproject"
assert test_tool.repository_name == "example"
assert test_tool.installed_changeset_revision == "1"
# TODO: Not deterministc, probably should be?
assert test_tool.installed_changeset_revision in ["1", "2"]
def test_tool_shed_properties_only_on_installed_tools( self ):
self._init_tool()
@@ -259,7 +260,10 @@ class ToolBoxTestCase( BaseToolBoxTestCase ):
self._init_tool()
self._setup_two_versions_in_config( )
self._setup_two_versions()
assert self.toolbox.get_tool_id( "test_tool" ) == "github.com/galaxyproject/example/test_tool/0.1"
assert self.toolbox.get_tool_id( "test_tool" ) 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" ) is None