projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6663-git-server
[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..65af8ce2bd9a732e1e7d2ace6772f618670cc5dc 100644
(file)
--- a/
services/api/test/websocket_runner.rb
+++ b/
services/api/test/websocket_runner.rb
@@
-6,8
+6,8
@@
SERVER_PID_PATH = 'tmp/pids/passenger.3002.pid'
class WebsocketTestRunner < MiniTest::Unit
def _system(*cmd)
Bundler.with_clean_env do
class WebsocketTestRunner < MiniTest::Unit
def _system(*cmd)
Bundler.with_clean_env do
- if not system({'ARVADOS_WEBSOCKETS' => '
1
', 'RAILS_ENV' => 'test'}, *cmd)
- raise RuntimeError, "
#{cmd[0]} returned exit code #{$?.exitstatus
}"
+ if not system({'ARVADOS_WEBSOCKETS' => '
ws-only
', 'RAILS_ENV' => 'test'}, *cmd)
+ raise RuntimeError, "
Command failed with exit status #{$?}: #{cmd.inspect
}"
end
end
end
end
end
end
@@
-34,7
+34,13
@@
class WebsocketTestRunner < MiniTest::Unit
begin
super(args)
ensure
begin
super(args)
ensure
- Process.kill('TERM', server_pid)
+ Dir.chdir($ARV_API_SERVER_DIR) do
+ _system('passenger', 'stop', '-p3002')
+ end
+ # DatabaseCleaner leaves the database empty. Prefer to leave it full.
+ dc = DatabaseController.new
+ dc.define_singleton_method :render do |*args| end
+ dc.reset
end
end
end
end
end
end