From: Tom Clegg <tom@curoverse.com>
Date: Fri, 16 Jan 2015 01:24:11 +0000 (-0500)
Subject: 3021: Do not drop/create API database at startup if run-tests.sh has done that for us.
X-Git-Tag: 1.1.0~1880^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5933c83688fcb9cfd7b45b52c171fab6a1e894c5

3021: Do not drop/create API database at startup if run-tests.sh has done that for us.
---

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 2b480f9b39..d469d16f0c 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -160,8 +160,10 @@ class ApiServerForTests
                 '--pid-file', @pidfile)
       else
         make_ssl_cert
-        _system('bundle', 'exec', 'rake', 'db:test:load')
-        _system('bundle', 'exec', 'rake', 'db:fixtures:load')
+        if ENV['ARVADOS_TEST_API_INSTALLED'].blank?
+          _system('bundle', 'exec', 'rake', 'db:test:load')
+          _system('bundle', 'exec', 'rake', 'db:fixtures:load')
+        end
         _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
                 '--pid-file', @pidfile,
                 '--ssl',