15759: Merge branch 'master' into 15759-deploy-crunch-run

[arvados.git] / sdk / cwl / tests / 12213-keepref-expr.cwl

diff --git a/sdk/cwl/tests/12213-keepref-expr.cwl b/sdk/cwl/tests/12213-keepref-expr.cwl
index c28f7e87d67693d339fd24dc58cfd98b00851aa6..697f38017d4f0060afdae7915f472e90a9652770 100644 (file)
--- a/sdk/cwl/tests/12213-keepref-expr.cwl
+++ b/sdk/cwl/tests/12213-keepref-expr.cwl
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 cwlVersion: v1.0
 class: ExpressionTool
 requirements:
@@ -10,6 +14,7 @@ expression: |
   ${
     var samples = {};
     var pattern = /^(.+)(_S[0-9]{1,3}_)(.+)$/;
+    inputs.dir.listing = inputs.dir.listing.sort(function(a, b) { return a.basename.localeCompare(b.basename); });
     for (var i = 0; i < inputs.dir.listing.length; i++) {
       var file = inputs.dir.listing[i];
       var groups = file.basename.match(pattern);
@@ -22,10 +27,10 @@ expression: |
       }
     }
     var dirs = [];
-    for (var sampleid in samples) {
+    Object.keys(samples).sort().forEach(function(sampleid, _) {
       dirs.push({"class": "Directory",
                  "basename": sampleid,
                  "listing": samples[sampleid]});
-    }
+    });
     return {"out": dirs};
-  }
\ No newline at end of file
+  }