diff --git a/lib/galaxy/tool_util/linters/inputs.py b/lib/galaxy/tool_util/linters/inputs.py index db603f417927..e1f8a532f7fd 100644 --- a/lib/galaxy/tool_util/linters/inputs.py +++ b/lib/galaxy/tool_util/linters/inputs.py @@ -13,11 +13,6 @@ _prepare_argument, ) from galaxy.util import string_as_bool -from ._util import ( - get_code, - is_datasource, - is_valid_cheetah_placeholder, -) FILTER_TYPES = [ "data_meta", @@ -590,7 +585,7 @@ def lint_inputs_used(tool_xml, lint_ctx): try: code, template_code, filter_code, label_code, action_code = get_code(tool_xml) except ParseError as pe: - lint_ctx.error(f"Invalid cheetah found {pe}", node=tool_node) + lint_ctx.error(f"Invalid cheetah found{pe}", node=tool_node) return inputs = tool_xml.findall("./inputs//param") diff --git a/test/unit/tool_util/test_tool_linters.py b/test/unit/tool_util/test_tool_linters.py index 43e96971995b..6c38cff68ffb 100644 --- a/test/unit/tool_util/test_tool_linters.py +++ b/test/unit/tool_util/test_tool_linters.py @@ -626,8 +626,7 @@ #if $param - this is unfinished if - + this is unfinished if @@ -1546,19 +1545,21 @@ def test_inputs_used_parameter_syntax_error(lint_ctx): assert not lint_ctx.info_messages assert not lint_ctx.valid_messages assert not lint_ctx.warn_messages - assert """Invalid cheetah found + assert ( + """Invalid cheetah found Some #directives are missing their corresponding #end ___ tag: if -Line 5, column 4 +Line 4, column 33 Line|Cheetah Code ----|------------------------------------------------------------- 2 | 3 | #if $param -4 | this is unfinished if -5 | - ^ -""" in lint_ctx.error_messages +4 | this is unfinished if + ^ +""" + in lint_ctx.error_messages + ) def test_inputs_repeats(lint_ctx):