From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 19 May 2022 13:45:37 +0000 (-0400)
Subject: Merge branch '17004-properties-on-output' refs #17004
X-Git-Tag: 2.5.0~165
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c36ec856598f214e340e3335ddd347d131335bf8?hp=-c

Merge branch '17004-properties-on-output' refs #17004

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

c36ec856598f214e340e3335ddd347d131335bf8
diff --combined sdk/cwl/tests/arvados-tests.sh
index 7d27523d30,e3f1622836..b1a1837466
--- a/sdk/cwl/tests/arvados-tests.sh
+++ b/sdk/cwl/tests/arvados-tests.sh
@@@ -1,14 -1,9 +1,14 @@@
 -#!/bin/sh
 +#!/bin/bash
  # Copyright (C) The Arvados Authors. All rights reserved.
  #
  # SPDX-License-Identifier: Apache-2.0
 +#
 +# This in an additional integration test suite for Arvados specific
 +# bugs and features that are not covered by the unit tests or CWL
 +# conformance tests.
 +#
  
 -set -e
 +set -ex
  
  if ! arv-get d7514270f356df848477718d58308cc4+94 > /dev/null ; then
      arv-put --portable-data-hash testdir/*
@@@ -23,9 -18,6 +23,9 @@@ if ! arv-get 20850f01122e860fb878758ac1
      arv-put --portable-data-hash samples/sample1_S01_R1_001.fastq.gz
  fi
  
 +# Use the python executor associated with the installed OS package, if present.
 +python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || echo python3) | head -n1) 2>/dev/null)
 +
  # Test for #18888
  # This is a standalone test because the bug was observed with this
  # command line and was thought to be due to command line handling.
@@@ -34,7 -26,11 +34,11 @@@ arvados-cwl-runner 18888-download_def.c
  # Test for #19070
  # The most effective way to test this seemed to be to write an
  # integration test to check for the expected behavior.
 -python test_copy_deps.py
 +$python test_copy_deps.py
  
+ # Test for #17004
+ # Checks that the final output collection has the expected properties.
+ python test_set_output_prop.py
+ 
  # Run integration tests
  exec cwltest --test arvados-tests.yml --tool arvados-cwl-runner $@ -- --disable-reuse --compute-checksum --api=containers