13306: Fix 12213-keepref test

Test itself was buggy and seems to have been relying on undefined
behavior, py3 exposed the bug.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/tests/12213-keepref-expr.cwl b/sdk/cwl/tests/12213-keepref-expr.cwl
index a7445449af6030e7afee4bdb524ac55afc90b8ec..697f38017d4f0060afdae7915f472e90a9652770 100644 (file)
--- a/sdk/cwl/tests/12213-keepref-expr.cwl
+++ b/sdk/cwl/tests/12213-keepref-expr.cwl
@@ -14,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);
@@ -32,4 +33,4 @@ expression: |
                  "listing": samples[sampleid]});
     });
     return {"out": dirs};
-  }
\ No newline at end of file
+  }

diff --git a/sdk/cwl/tests/arvados-tests.yml b/sdk/cwl/tests/arvados-tests.yml
index e51c7a2531dbea456112ae577ec4698c88883e09..8b8ff28c789d771ba0c2e54855beb82381ee6a83 100644 (file)
--- a/sdk/cwl/tests/arvados-tests.yml
+++ b/sdk/cwl/tests/arvados-tests.yml
@@ -102,8 +102,8 @@
             "size": 32
         },
         {
-            "checksum": "sha1$83483b9c65d99967aecc794c14f9f4743314d186",
-            "location": "sample2_S01_R3_001.fastq.txt",
+            "checksum": "sha1$5f3b4df1b0f7fdced751fc6079778600ad9fdb45",
+            "location": "sample2_S01_R1_001.fastq.txt",
             "class": "File",
             "size": 32
         }