Merge branch 'master' into 4523-full-text-search

[arvados.git] / services / api / test / integration / websocket_test.rb

diff --git a/services/api/test/integration/websocket_test.rb b/services/api/test/integration/websocket_test.rb
index 4864c53745a929673eca6f647791731ba58e561d..d5808d885344e9360cd5fc75e5aa6476c5edcb13 100644 (file)
--- a/services/api/test/integration/websocket_test.rb
+++ b/services/api/test/integration/websocket_test.rb
@@ -3,7 +3,7 @@ require 'websocket_runner'
 require 'oj'
 require 'database_cleaner'
 
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :deletion
 
 class WebsocketTest < ActionDispatch::IntegrationTest
   self.use_transactional_fixtures = false
@@ -611,7 +611,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
     authorize_with :admin
 
     ws_helper :admin, false do |ws|
-      EM::Timer.new 8 do
+      EM::Timer.new 45 do
         # Needs a longer timeout than the default
         ws.close
       end