X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f180576ff3ec675e5ad27856a83773166ac6a5ca..e378ed1d86cbab36f0c7093e4dc189f6184834bf:/services/api/app/controllers/database_controller.rb

diff --git a/services/api/app/controllers/database_controller.rb b/services/api/app/controllers/database_controller.rb
index 04c0e79d6c..21c8e4710c 100644
--- a/services/api/app/controllers/database_controller.rb
+++ b/services/api/app/controllers/database_controller.rb
@@ -29,6 +29,10 @@ class DatabaseController < ApplicationController
     fixturesets = Dir.glob(Rails.root.join('test', 'fixtures', '*.yml')).
       collect { |yml| yml.match(/([^\/]*)\.yml$/)[1] }
 
+    # Don't reset keep_services: clients need to discover our
+    # integration-testing keepstores, not test fixtures.
+    fixturesets -= %w[keep_services]
+
     table_names = '"' + ActiveRecord::Base.connection.tables.join('","') + '"'
 
     attempts_left = 20
@@ -68,6 +72,6 @@ class DatabaseController < ApplicationController
     end
 
     # Done.
-    render json: {success: true}
+    send_json success: true
   end
 end