Refactor code

Author: GlassOfWhiskey

cwltool/command_line_tool.py

@@ -1216,6 +1216,7 @@ def collect_output_ports(
         if cwl_version != "v1.0":
             builder.resources["exitCode"] = rcode
         try:
+            expected_schema = cast(RecordSchema, self.names.get_name("outputs_record_schema", None))
             fs_access = builder.make_fs_access(outdir)
             custom_output = fs_access.join(outdir, "cwl.output.json")
             if fs_access.exists(custom_output):
@@ -1227,6 +1228,20 @@ def collect_output_ports(
                         custom_output,
                         json_dumps(ret, indent=4),
                     )
+                if ORDERED_VERSIONS.index(cast(str, cwl_version)) >= ORDERED_VERSIONS.index(
+                    "v1.3.0-dev1"
+                ):
+                    for k in list(ret):
+                        found = False
+                        for field in expected_schema.fields:
+                            if k == field.name:
+                                found = True
+                                break
+                        if not found:
+                            _logger.warning(
+                                f"Discarded undeclared output named {k!r} from {custom_output}."
+                            )
+                            ret.pop(k)
             else:
                 for i, port in enumerate(ports):
                     with SourceLine(
@@ -1257,21 +1272,6 @@ def collect_output_ports(
 
                 if compute_checksum:
                     adjustFileObjs(ret, partial(compute_checksums, fs_access))
-            expected_schema = cast(RecordSchema, self.names.get_name("outputs_record_schema", None))
-            if ORDERED_VERSIONS.index(cast(str, cwl_version)) >= ORDERED_VERSIONS.index(
-                "v1.3.0-dev1"
-            ):
-                for k in list(ret):
-                    found = False
-                    for field in expected_schema.fields:
-                        if k == field.name:
-                            found = True
-                            break
-                    if not found:
-                        _logger.warning(
-                            f"Discarded undeclared output named {k!r} from {custom_output}."
-                        )
-                        ret.pop(k)
             validate_ex(
                 expected_schema,
                 ret,

tests/test-cwl-out-v1.0.cwl

@@ -8,7 +8,7 @@ baseCommand: sh
 arguments:
    - -c
    - |
-     echo foo > foo && echo '{"foo": {"location": "foo", "class": "File"} }'
+     echo '{"foo": 5 }'
 
 stdout: cwl.output.json
 

tests/test-cwl-out-v1.1.cwl

@@ -8,7 +8,7 @@ baseCommand: sh
 arguments:
    - -c
    - |
-     echo foo > foo && echo '{"foo": {"location": "foo", "class": "File"} }'
+     echo '{"foo": 5 }'
 
 stdout: cwl.output.json
 

tests/test-cwl-out-v1.2.cwl

@@ -8,7 +8,7 @@ baseCommand: sh
 arguments:
    - -c
    - |
-     echo foo > foo && echo '{"foo": {"location": "foo", "class": "File"} }'
+     echo '{"foo": 5 }'
 
 stdout: cwl.output.json