X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0c1be947ff362ebf31e2af9440abbb4464a8c6f5..c6ccae902b16d7ff421e87f1b9c3578ef8a4334e:/tools/run-integration-tests.sh

diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 68e8a56077..140de3c8ad 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -7,6 +7,7 @@ set -e -o pipefail
 
 cleanup() {
     set -x
+    set +e +o pipefail
     kill ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID}
     wait ${arvboot_PID} ${consume_stdout_PID} ${wb2_PID} ${consume_wb2_stdout_PID} || true
     if [ "${CLEANUP_ARVADOS_DIR}" -eq "1" ]; then
@@ -74,7 +75,7 @@ if [ ! -f ${ARVADOS_CONF} ]; then
 fi
 
 if [ -f "${WB2_DIR}/public/config.json" ]; then
-    echo "ERROR: Cannot run with Workbench2's public/config.json file"
+    echo "ERROR: Please move public/config.json file out of the way"
     exit 1
 fi