remove is_multi_byte from test

This commit is contained in:
Matthias Bernt
2021-11-27 14:28:59 +01:00
parent 311836603d
commit ac5399fb8e
2 changed files with 10 additions and 19 deletions
+1 -10
View File
@@ -11,7 +11,7 @@ from galaxy.util import galaxy_directory
TOOL_XML_1 = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<xrefs>
<xref type="bio.tools">bwa</xref>
@@ -266,9 +266,6 @@ class XmlLoaderTestCase(BaseLoaderTestCase):
def test_name(self):
assert self._tool_source.parse_name() == "BWA Mapper"
def test_is_multi_byte(self):
assert self._tool_source.parse_is_multi_byte()
def test_display_interface(self):
assert self._tool_source.parse_display_interface(False)
@@ -429,9 +426,6 @@ class YamlLoaderTestCase(BaseLoaderTestCase):
def test_name(self):
assert self._tool_source.parse_name() == "Bowtie Mapper"
def test_is_multi_byte(self):
assert not self._tool_source.parse_is_multi_byte()
def test_display_interface(self):
assert not self._tool_source.parse_display_interface(False)
assert self._tool_source.parse_display_interface(True)
@@ -665,9 +659,6 @@ class SpecialToolLoaderTestCase(BaseLoaderTestCase):
assert tool_module[1] == "ExportHistoryTool"
assert self._tool_source.parse_tool_type() == "export_history"
def test_is_multi_byte(self):
assert not self._tool_source.parse_is_multi_byte()
def test_version_command(self):
assert self._tool_source.parse_version_command() is None
assert self._tool_source.parse_version_command_interpreter() is None
+9 -9
View File
@@ -13,7 +13,7 @@ from galaxy.tool_util.parser.xml import XmlToolSource
from galaxy.util import etree
WHITESPACE_IN_VERSIONS_AND_NAMES = """
<tool name=" BWA Mapper " id="bwa tool" version=" 1.0.1 " is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name=" BWA Mapper " id="bwa tool" version=" 1.0.1 " display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<requirements>
<requirement type="package" version=" 1.2.5 "> bwa </requirement>
@@ -30,7 +30,7 @@ WHITESPACE_IN_VERSIONS_AND_NAMES = """
"""
REQUIREMENT_WO_VERSION = """
<tool name="BWA Mapper" id="bwa_tool" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa_tool" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<requirements>
<requirement type="package">bwa</requirement>
@@ -48,14 +48,14 @@ REQUIREMENT_WO_VERSION = """
"""
NO_SECTIONS_XML = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
</tool>
"""
NO_WHEN_IN_CONDITIONAL_XML = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<inputs>
@@ -100,7 +100,7 @@ SELECT_DUPLICATED_OPTIONS = """
"""
SELECT_DEPRECATIONS = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<inputs>
@@ -139,7 +139,7 @@ SELECT_OPTION_DEFINITIONS = """
"""
VALIDATOR_INCOMPATIBILITIES = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<inputs>
@@ -152,7 +152,7 @@ VALIDATOR_INCOMPATIBILITIES = """
"""
VALIDATOR_CORRECT = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<inputs>
@@ -199,7 +199,7 @@ VALIDATOR_CORRECT = """
# check that linter accepts format source for collection elements as means to specify format
# and that the linter warns if format and format_source are used
OUTPUTS_COLLECTION_FORMAT_SOURCE = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<outputs>
@@ -213,7 +213,7 @@ OUTPUTS_COLLECTION_FORMAT_SOURCE = """
# check that linter does not complain about missing format if from_tool_provided_metadata is used
OUTPUTS_DISCOVER_TOOL_PROVIDED_METADATA = """
<tool name="BWA Mapper" id="bwa" version="1.0.1" is_multi_byte="true" display_interface="true" require_login="true" hidden="true">
<tool name="BWA Mapper" id="bwa" version="1.0.1" display_interface="true" require_login="true" hidden="true">
<description>The BWA Mapper</description>
<version_command interpreter="python">bwa.py --version</version_command>
<outputs>