[ARVADOS] updated: 1.3.0-229-g77d847ff1

Git user git at public.curoverse.com
Thu Jan 31 12:54:59 EST 2019


Summary of changes:
 sdk/cwl/tests/12213-keepref-expr.cwl | 3 ++-
 sdk/cwl/tests/arvados-tests.yml      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  77d847ff11736567d67c91cb89aea9c9f3c0c83e (commit)
      from  7e1c8ea79a19d5f756f8549474547da52137ce6d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 77d847ff11736567d67c91cb89aea9c9f3c0c83e
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Jan 31 12:54:10 2019 -0500

    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 at veritasgenetics.com>

diff --git a/sdk/cwl/tests/12213-keepref-expr.cwl b/sdk/cwl/tests/12213-keepref-expr.cwl
index a7445449a..697f38017 100644
--- 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 e51c7a253..8b8ff28c7 100644
--- 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
         }

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list