Update linting for parameters that define arguments and not names.

jmchilton · jmchilton · commit aad1eedd9115 · 2015-07-01T22:12:53.000-04:00
With test case. Closes #245.
diff --git a/planemo_ext/galaxy/tools/linters/inputs.py b/planemo_ext/galaxy/tools/linters/inputs.py
@@ -10,15 +10,15 @@ def lint_inputs(tool_xml, lint_ctx):
         if "type" not in param_attrib:
             lint_ctx.error("Found param input with no type specified.")
             has_errors = True
-        if "name" not in param_attrib:
+        if "name" not in param_attrib and "argument" not in param_attrib:
             lint_ctx.error("Found param input with no name specified.")
             has_errors = True
 
         if has_errors:
             continue
 
         param_type = param_attrib["type"]
-        param_name = param_attrib["name"]
+        param_name = param_attrib.get("name", param_attrib.get("argument"))
         if param_type == "data":
             if "format" not in param_attrib:
                 lint_ctx.warn("Param input [%s] with no format specified - 'data' format will be assumed.", param_name)
diff --git a/tests/data/tools/ok_param_argument.xml b/tests/data/tools/ok_param_argument.xml
@@ -0,0 +1,30 @@
+<tool id="copy" name="Copy Dataset" version="1.0">
+    <description>copies a dataset</description>
+    <command>
+        cp $input $output
+    </command>
+    <inputs>
+        <param name="input1" type="data" format="txt" label="Concatenate Dataset"/>
+        <param argument="-r" type="data" format="txt" label="Recursive?"/>
+    </inputs>
+    <outputs>
+        <data name="output" format="txt"/>
+    </outputs>
+    <tests>
+        <test expect_failure="true" expect_exit_code="1">
+            <param name="input1" value="1.bed"/>
+            <assert_stdout>
+                <has_line line="Indexed 0 sequences" />
+            </assert_stdout>
+            <assert_stderr>
+                <has_line line="Identifier 'gi|16127999|ref|NP_414546.1|' not found in sequence file" />
+            </assert_stderr>
+      </test>
+    </tests>
+    <help>
+        Some Awesome Help!
+    </help>
+    <citations>
+        <citation type="doi">10.1101/014043</citation>
+    </citations>
+</tool>
