Merge branch 'master' into 3112-report-bug

[arvados.git] / services / api / test / websocket_runner.rb

diff --git a/services/api/test/websocket_runner.rb b/services/api/test/websocket_runner.rb
index c35938e8826b5d7cd519f8249519e222030da20e..df72e246a6cedadf53386c3420c6f8d168ded8d6 100644 (file)
--- a/services/api/test/websocket_runner.rb
+++ b/services/api/test/websocket_runner.rb
@@ -6,7 +6,7 @@ SERVER_PID_PATH = 'tmp/pids/passenger.3002.pid'
 class WebsocketTestRunner < MiniTest::Unit
   def _system(*cmd)
     Bundler.with_clean_env do
-      if not system({'ARVADOS_WEBSOCKETS' => '1', 'RAILS_ENV' => 'test'}, *cmd)
+      if not system({'ARVADOS_WEBSOCKETS' => 'ws-only', 'RAILS_ENV' => 'test'}, *cmd)
         raise RuntimeError, "#{cmd[0]} returned exit code #{$?.exitstatus}"
       end
     end