projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
152e3b9
)
Set RAILS_ENV consistently. Support "sevices/keepstore_test=-v" etc. No issue #
author
Tom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:01:11 +0000
(16:01 -0500)
committer
Tom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:01:11 +0000
(16:01 -0500)
jenkins/run-tests.sh
patch
|
blob
|
history
diff --git
a/jenkins/run-tests.sh
b/jenkins/run-tests.sh
index 05cc65d79e00b3816edc796bc859f6e297e878ab..e437a21262ceaa4558650b76098a2a905471cd00 100755
(executable)
--- a/
jenkins/run-tests.sh
+++ b/
jenkins/run-tests.sh
@@
-313,7
+313,7
@@
do_test() {
timer_reset
if [[ "$2" == "go" ]]
then
timer_reset
if [[ "$2" == "go" ]]
then
- go test "git.curoverse.com/arvados.git/$1"
+ go test "
${testargs[$1]}" "
git.curoverse.com/arvados.git/$1"
elif [[ "$2" == "pip" ]]
then
# Other test suites can depend on tests_require
elif [[ "$2" == "pip" ]]
then
# Other test suites can depend on tests_require
@@
-413,8
+413,7
@@
done
install_apiserver() {
cd "$WORKSPACE/services/api"
install_apiserver() {
cd "$WORKSPACE/services/api"
- export RAILS_ENV=test
- bundle install --no-deployment
+ RAILS_ENV=test bundle install --no-deployment
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
@@
-453,9
+452,9
@@
install_apiserver() {
psql arvados_test -c "SELECT pg_terminate_backend (pg_stat_activity.procpid::int) FROM pg_stat_activity WHERE pg_stat_activity.datname = 'arvados_test';" 2>/dev/null
cd "$WORKSPACE/services/api" \
psql arvados_test -c "SELECT pg_terminate_backend (pg_stat_activity.procpid::int) FROM pg_stat_activity WHERE pg_stat_activity.datname = 'arvados_test';" 2>/dev/null
cd "$WORKSPACE/services/api" \
- && bundle exec rake db:drop \
- && bundle exec rake db:create \
- && bundle exec rake db:setup
+ &&
RAILS_ENV=test
bundle exec rake db:drop \
+ &&
RAILS_ENV=test
bundle exec rake db:create \
+ &&
RAILS_ENV=test
bundle exec rake db:setup
}
do_install services/api apiserver
}
do_install services/api apiserver
@@
-505,7
+504,7
@@
do_test sdk/cli cli
test_apiserver() {
cd "$WORKSPACE/services/api"
test_apiserver() {
cd "$WORKSPACE/services/api"
- bundle exec rake test ${testargs[apiserver]}
+
RAILS_ENV=test
bundle exec rake test ${testargs[apiserver]}
}
do_test services/api apiserver
}
do_test services/api apiserver
@@
-523,13
+522,13
@@
done
test_workbench() {
cd "$WORKSPACE/apps/workbench" \
test_workbench() {
cd "$WORKSPACE/apps/workbench" \
- && bundle exec rake test ${testargs[workbench]}
+ &&
RAILS_ENV=test
bundle exec rake test ${testargs[workbench]}
}
do_test apps/workbench workbench
test_workbench_performance() {
cd "$WORKSPACE/apps/workbench" \
}
do_test apps/workbench workbench
test_workbench_performance() {
cd "$WORKSPACE/apps/workbench" \
- && bundle exec rake test:benchmark
+ &&
RAILS_ENV=test
bundle exec rake test:benchmark
}
do_test apps/workbench_performance workbench_performance
}
do_test apps/workbench_performance workbench_performance