14886: Fixes mock issue between tests

[arvados.git] / sdk / cwl / test_with_arvbox.sh

diff --git a/sdk/cwl/test_with_arvbox.sh b/sdk/cwl/test_with_arvbox.sh
index 936560366f3eb89a098a2483f88d4bb5cb20f0fa..37eb5171ebbc55779f86e0e275e4eb8d7a490cd6 100755 (executable)
--- a/sdk/cwl/test_with_arvbox.sh
+++ b/sdk/cwl/test_with_arvbox.sh
@@ -15,6 +15,7 @@ config=dev
 tag="latest"
 pythoncmd=python
 suite=conformance
+runapi=containers
 
 while test -n "$1" ; do
     arg="$1"
@@ -47,6 +48,10 @@ while test -n "$1" ; do
             suite=$2
             shift ; shift
             ;;
+       --api)
+           runapi=$2
+            shift ; shift
+            ;;
         -h|--help)
             echo "$0 [--no-reset-container] [--leave-running] [--config dev|localdemo] [--tag docker_tag] [--build] [--pythoncmd python(2|3)] [--suite (integration|conformance)]"
             exit
@@ -87,7 +92,7 @@ set -x
 if [ \$PYCMD = "python3" ]; then
     pip3 install cwltest
 else
-    pip3 install cwltest
+    pip install cwltest
 fi
 
 mkdir -p /tmp/cwltest
@@ -127,7 +132,7 @@ chmod +x /tmp/cwltest/arv-cwl-containers
 
 env
 if [[ "$suite" = "conformance" ]] ; then
-   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-containers EXTRA=--compute-checksum $@
+   exec ./run_test.sh RUNNER=/tmp/cwltest/arv-cwl-${runapi} EXTRA=--compute-checksum $@
 elif [[ "$suite" = "integration" ]] ; then
    cd /usr/src/arvados/sdk/cwl/tests
    exec ./arvados-tests.sh $@