projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18947: Update keep-balance package script.
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 8ae9ade3229d9afaecb6b8967ef3de296590d3b7..0f996f77e927b4c4d6e0eae6458c4d80f3229be7 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-40,7
+40,7
@@
sdk/python_test="--test-suite tests.test_keep_locator"
Restrict Python SDK tests to the given class
apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
Restrict Workbench tests to the given file
Restrict Python SDK tests to the given class
apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
Restrict Workbench tests to the given file
-services/githttp_test="-check.vv"
+services/githttp
d
_test="-check.vv"
Show all log messages, even when tests pass (also works
with services/keepstore_test etc.)
ARVADOS_DEBUG=1
Show all log messages, even when tests pass (also works
with services/keepstore_test etc.)
ARVADOS_DEBUG=1
@@
-92,7
+92,7
@@
lib/mount
lib/pam
lib/service
services/api
lib/pam
lib/service
services/api
-services/githttp
+services/githttp
d
services/crunchstat
services/dockercleaner
services/fuse
services/crunchstat
services/dockercleaner
services/fuse
@@
-158,6
+158,8
@@
only_install=
temp=
temp_preserve=
temp=
temp_preserve=
+ignore_sigint=
+
clear_temp() {
if [[ -z "$temp" ]]; then
# we did not even get as far as making a temp dir
clear_temp() {
if [[ -z "$temp" ]]; then
# we did not even get as far as making a temp dir
@@
-410,7
+412,7
@@
start_services() {
return 0
fi
. "$VENV3DIR/bin/activate"
return 0
fi
. "$VENV3DIR/bin/activate"
- echo 'Starting API, controller, keepproxy, keep-web, githttp, ws, and nginx ssl proxy...'
+ echo 'Starting API, controller, keepproxy, keep-web, githttp
d
, ws, and nginx ssl proxy...'
if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
mkdir -p "$WORKSPACE/services/api/log"
fi
if [[ ! -d "$WORKSPACE/services/api/log" ]]; then
mkdir -p "$WORKSPACE/services/api/log"
fi
@@
-438,8
+440,8
@@
start_services() {
&& python3 sdk/python/tests/run_test_server.py start_keep-web \
&& checkpidfile keep-web \
&& checkhealth WebDAV \
&& python3 sdk/python/tests/run_test_server.py start_keep-web \
&& checkpidfile keep-web \
&& checkhealth WebDAV \
- && python3 sdk/python/tests/run_test_server.py start_githttp \
- && checkpidfile githttp \
+ && python3 sdk/python/tests/run_test_server.py start_githttp
d
\
+ && checkpidfile githttp
d
\
&& checkhealth GitHTTP \
&& python3 sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
&& checkhealth GitHTTP \
&& python3 sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
@@
-461,7
+463,7
@@
stop_services() {
. "$VENV3DIR/bin/activate" || return
cd "$WORKSPACE" \
&& python3 sdk/python/tests/run_test_server.py stop_nginx \
. "$VENV3DIR/bin/activate" || return
cd "$WORKSPACE" \
&& python3 sdk/python/tests/run_test_server.py stop_nginx \
- && python3 sdk/python/tests/run_test_server.py stop_githttp \
+ && python3 sdk/python/tests/run_test_server.py stop_githttp
d
\
&& python3 sdk/python/tests/run_test_server.py stop_ws \
&& python3 sdk/python/tests/run_test_server.py stop_keep-web \
&& python3 sdk/python/tests/run_test_server.py stop_keep_proxy \
&& python3 sdk/python/tests/run_test_server.py stop_ws \
&& python3 sdk/python/tests/run_test_server.py stop_keep-web \
&& python3 sdk/python/tests/run_test_server.py stop_keep_proxy \
@@
-473,6
+475,10
@@
stop_services() {
}
interrupt() {
}
interrupt() {
+ if [[ -n "$ignore_sigint" ]]; then
+ echo >&2 "ignored SIGINT"
+ return
+ fi
failures+=("($(basename $0) interrupted)")
exit_cleanly
}
failures+=("($(basename $0) interrupted)")
exit_cleanly
}
@@
-1216,6
+1222,7
@@
else
setnextcmd
HISTFILE="$WORKSPACE/tmp/.history"
history -r
setnextcmd
HISTFILE="$WORKSPACE/tmp/.history"
history -r
+ ignore_sigint=1
while read -p 'What next? ' -e -i "$nextcmd" nextcmd; do
history -s "$nextcmd"
history -w
while read -p 'What next? ' -e -i "$nextcmd" nextcmd; do
history -s "$nextcmd"
history -w