From 5933c83688fcb9cfd7b45b52c171fab6a1e894c5 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 15 Jan 2015 20:24:11 -0500 Subject: [PATCH] 3021: Do not drop/create API database at startup if run-tests.sh has done that for us. --- apps/workbench/test/test_helper.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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', -- 2.30.2