fix: Option arrays

Use of decoder 1.11.5

Author: Alan Christie

.pylintrc

@@ -9,4 +9,5 @@ disable = import-error,
           too-many-locals,
           too-many-branches,
           too-many-instance-attributes,
+          too-many-nested-blocks,
           too-many-statements

requirements.txt

@@ -1,5 +1,5 @@
 docker-compose == 1.29.2
-im-data-manager-job-decoder == 1.11.4
+im-data-manager-job-decoder == 1.11.5
 munch == 2.5.0
 pyyaml == 5.4.1
 yamllint == 1.26.3

src/jote/jote.py

@@ -518,26 +518,21 @@ def _test(
                     # Record but do no further processing
                     tests_failed += 1
                     test_status = False
-                # Is it declared as a list?
-                value_is_list: bool = False
-                if variable_is_option:
-                    if job_definition.variables.options.properties[variable].multiple:
-                        value_is_list = True
-                else:
+
+                if variable_is_input:
+                    # Is it an input (not an option).
+                    # The input is a list if it's declared as 'multiple'
                     if job_definition.variables.inputs.properties[variable].multiple:
-                        value_is_list = True
-
-                # Add each value or just one value
-                # (depending on whether it's a list)
-                if value_is_list:
-                    job_variables[variable] = []
-                    for value in job_definition.tests[job_test_name].inputs[variable]:
-                        job_variables[variable].append(os.path.basename(value))
+                        job_variables[variable] = []
+                        for value in job_definition.tests[job_test_name].inputs[
+                            variable
+                        ]:
+                            job_variables[variable].append(os.path.basename(value))
+                            input_files.append(value)
+                    else:
+                        value = job_definition.tests[job_test_name].inputs[variable]
+                        job_variables[variable] = os.path.basename(value)
                         input_files.append(value)
-                else:
-                    value = job_definition.tests[job_test_name].inputs[variable]
-                    job_variables[variable] = os.path.basename(value)
-                    input_files.append(value)
 
         decoded_command: str = ""
         test_environment: Dict[str, str] = {}