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

[arvados.git] / sdk / cwl / tests / arvados-tests.sh

diff --git a/sdk/cwl/tests/arvados-tests.sh b/sdk/cwl/tests/arvados-tests.sh
index e3f1622836517955d63189eb74363d93dbfe16be..b1a183746676dd7dd4971c0f0f8b73ebbca051d3 100755 (executable)
--- a/sdk/cwl/tests/arvados-tests.sh
+++ b/sdk/cwl/tests/arvados-tests.sh
@@ -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/*
@@ -18,6 +23,9 @@ if ! arv-get 20850f01122e860fb878758ac1320877+71 > /dev/null ; then
     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.
@@ -26,7 +34,7 @@ arvados-cwl-runner 18888-download_def.cwl --scripts scripts/
 # 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.