From 7efe1eb66d31585bd6cd4a52ef0d12e0bdd91a88 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Mon, 29 Dec 2014 16:01:11 -0500
Subject: [PATCH] Set RAILS_ENV consistently. Support
 "sevices/keepstore_test=-v" etc. No issue #

---
 jenkins/run-tests.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 05cc65d79e..e437a21262 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -313,7 +313,7 @@ do_test() {
         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
@@ -413,8 +413,7 @@ done
 
 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
@@ -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" \
-        && 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
 
@@ -505,7 +504,7 @@ do_test sdk/cli cli
 
 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
 
@@ -523,13 +522,13 @@ done
 
 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" \
-        && bundle exec rake test:benchmark
+        && RAILS_ENV=test bundle exec rake test:benchmark
 }
 do_test apps/workbench_performance workbench_performance
 
-- 
2.30.2