projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14670-new-java-sdk-docs' refs #14670
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 66eba9961122a8bd0e9de3cbdeff63692cd36a26..8ff6326f37a4c869e3ed13e3321b179514ce003d 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-122,6
+122,7
@@
sdk/go/stats
sdk/go/crunchrunner
sdk/cwl
sdk/R
sdk/go/crunchrunner
sdk/cwl
sdk/R
+sdk/java-v2
tools/sync-groups
tools/crunchstat-summary
tools/crunchstat-summary:py3
tools/sync-groups
tools/crunchstat-summary
tools/crunchstat-summary:py3
@@
-394,7
+395,7
@@
start_services() {
return 0
fi
. "$VENVDIR/bin/activate"
return 0
fi
. "$VENVDIR/bin/activate"
- echo 'Starting API,
keepproxy, keep-web, ws, arv-git-httpd
, and nginx ssl proxy...'
+ echo 'Starting API,
controller, keepproxy, keep-web, arv-git-httpd, 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
@@
-403,9
+404,9
@@
start_services() {
rm -f "$WORKSPACE/tmp/api.pid"
fi
all_services_stopped=
rm -f "$WORKSPACE/tmp/api.pid"
fi
all_services_stopped=
- fail=
0
+ fail=
1
cd "$WORKSPACE" \
cd "$WORKSPACE" \
- && eval $(python sdk/python/tests/run_test_server.py start --auth admin
|| echo "fail=1; false"
) \
+ && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
&& export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
&& export ARVADOS_TEST_API_INSTALLED="$$" \
&& checkpidfile api \
&& export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
&& export ARVADOS_TEST_API_INSTALLED="$$" \
&& checkpidfile api \
@@
-420,17
+421,13
@@
start_services() {
&& checkpidfile arv-git-httpd \
&& python sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
&& checkpidfile arv-git-httpd \
&& python sdk/python/tests/run_test_server.py start_ws \
&& checkpidfile ws \
- && eval $(python sdk/python/tests/run_test_server.py start_nginx
|| echo "fail=1; false"
) \
+ && eval $(python sdk/python/tests/run_test_server.py start_nginx) \
&& checkdiscoverydoc $ARVADOS_API_HOST \
&& checkpidfile nginx \
&& export ARVADOS_TEST_PROXY_SERVICES=1 \
&& (env | egrep ^ARVADOS) \
&& checkdiscoverydoc $ARVADOS_API_HOST \
&& checkpidfile nginx \
&& export ARVADOS_TEST_PROXY_SERVICES=1 \
&& (env | egrep ^ARVADOS) \
- || fail=1
+ && fail=0
deactivate
deactivate
- if [[ $fail = 0 ]] && ! kill -0 "$(cat "$WORKSPACE/tmp/nginx.pid")"; then
- echo >&2 "ERROR: nginx seems to have died already"
- fail=1
- fi
if [[ $fail != 0 ]]; then
unset ARVADOS_TEST_API_HOST
fi
if [[ $fail != 0 ]]; then
unset ARVADOS_TEST_API_HOST
fi
@@
-753,6
+750,7
@@
do_test_once() {
title "test $1"
timer_reset
title "test $1"
timer_reset
+ result=
if which deactivate >/dev/null; then deactivate; fi
if ! . "$VENVDIR/bin/activate"
then
if which deactivate >/dev/null; then deactivate; fi
if ! . "$VENVDIR/bin/activate"
then
@@
-825,6
+823,7
@@
do_install_once() {
title "install $1"
timer_reset
title "install $1"
timer_reset
+ result=
if which deactivate >/dev/null; then deactivate; fi
if [[ "$1" != "env" ]] && ! . "$VENVDIR/bin/activate"; then
result=1
if which deactivate >/dev/null; then deactivate; fi
if [[ "$1" != "env" ]] && ! . "$VENVDIR/bin/activate"; then
result=1
@@
-959,6
+958,7
@@
install_services/api() {
|| return 1
cd "$WORKSPACE/services/api" \
|| return 1
cd "$WORKSPACE/services/api" \
+ && RAILS_ENV=test bundle exec rails db:environment:set \
&& RAILS_ENV=test bundle exec rake db:drop \
&& RAILS_ENV=test bundle exec rake db:setup \
&& RAILS_ENV=test bundle exec rake db:fixtures:load
&& RAILS_ENV=test bundle exec rake db:drop \
&& RAILS_ENV=test bundle exec rake db:setup \
&& RAILS_ENV=test bundle exec rake db:fixtures:load
@@
-1071,6
+1071,10
@@
test_sdk/cli() {
&& KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
}
&& KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test TESTOPTS=-v ${testargs[sdk/cli]}
}
+test_sdk/java-v2() {
+ cd "$WORKSPACE/sdk/java-v2" && gradle test
+}
+
test_services/login-sync() {
cd "$WORKSPACE/services/login-sync" \
&& bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
test_services/login-sync() {
cd "$WORKSPACE/services/login-sync" \
&& bundle exec rake test TESTOPTS=-v ${testargs[services/login-sync]}
@@
-1168,6
+1172,7
@@
test_all() {
do_test sdk/R
do_test sdk/cli
do_test services/login-sync
do_test sdk/R
do_test sdk/cli
do_test services/login-sync
+ do_test sdk/java-v2
do_test services/nodemanager_integration
for p in "${pythonstuff[@]}"
do
do_test services/nodemanager_integration
for p in "${pythonstuff[@]}"
do