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 6bc8b84f856c8d6899fb5666f6ba51c0ba14a02d..8ff6326f37a4c869e3ed13e3321b179514ce003d 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-395,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
@@
-750,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
@@
-822,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
@@
-956,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