X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4b88dab6ed8e3b583f0e4c1ea8b8e01adad4a6ad..cadb785fc63280862d71376def0128e4c70951f0:/apps/workbench/test/test_helper.rb?ds=sidebyside

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 65eed789c8..2b480f9b39 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics")
+ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics" and ENV["RAILS_ENV"] != "performance")
 
 unless ENV["NO_COVERAGE_TEST"]
   begin
@@ -267,6 +267,10 @@ class ActiveSupport::TestCase
 
   protected
   def self.reset_api_fixtures_now
+    # Never try to reset fixtures when we're just using test
+    # infrastructure to run performance/diagnostics suites.
+    return unless Rails.env == 'test'
+
     auth = api_fixture('api_client_authorizations')['admin_trustedclient']
     Thread.current[:arvados_api_token] = auth['api_token']
     ArvadosApiClient.new.api(nil, '../../database/reset', {})