From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 16 May 2022 17:20:29 +0000 (-0400)
Subject: Fix arvados-tests.sh to use python from a-c-r package if available.
X-Git-Tag: 2.5.0~174
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ead34cd306205a1f477a3d72df3293f48d5da3eb

Fix arvados-tests.sh to use python from a-c-r package if available.

Add note about the purpose of arvados-tests.sh

refs #19070

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

diff --git a/sdk/cwl/tests/arvados-tests.sh b/sdk/cwl/tests/arvados-tests.sh
index 1bbaa505e9..91b57efb26 100755
--- a/sdk/cwl/tests/arvados-tests.sh
+++ b/sdk/cwl/tests/arvados-tests.sh
@@ -2,6 +2,11 @@
 # 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
 
@@ -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 python) | 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
 
 # Run integration tests
 exec cwltest --test arvados-tests.yml --tool arvados-cwl-runner $@ -- --disable-reuse --compute-checksum --api=containers