projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 91b57efb2621865c234e1d30385a06de7bc3a971..b1a183746676dd7dd4971c0f0f8b73ebbca051d3 100755
(executable)
--- a/
sdk/cwl/tests/arvados-tests.sh
+++ b/
sdk/cwl/tests/arvados-tests.sh
@@
-1,4
+1,4
@@
-#!/bin/sh
+#!/bin/
ba
sh
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0
@@
-8,7
+8,7
@@
# conformance tests.
#
# conformance tests.
#
-set -e
+set -e
x
if ! arv-get d7514270f356df848477718d58308cc4+94 > /dev/null ; then
arv-put --portable-data-hash testdir/*
if ! arv-get d7514270f356df848477718d58308cc4+94 > /dev/null ; then
arv-put --portable-data-hash testdir/*
@@
-24,7
+24,7
@@
if ! arv-get 20850f01122e860fb878758ac1320877+71 > /dev/null ; then
fi
# Use the python executor associated with the installed OS package, if present.
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)
+python=$(((ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python || echo python
3
) | head -n1) 2>/dev/null)
# Test for #18888
# This is a standalone test because the bug was observed with this
# Test for #18888
# This is a standalone test because the bug was observed with this
@@
-36,5
+36,9
@@
arvados-cwl-runner 18888-download_def.cwl --scripts scripts/
# integration test to check for the expected behavior.
$python test_copy_deps.py
# integration test to check for the expected behavior.
$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
# Run integration tests
exec cwltest --test arvados-tests.yml --tool arvados-cwl-runner $@ -- --disable-reuse --compute-checksum --api=containers