projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10200-cwl-crunch-script' closes #10200
[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 65af8ce2bd9a732e1e7d2ace6772f618670cc5dc..be32a0f299d0b396b867c0ff9943fc3234da7ce3 100644
(file)
--- a/
services/api/test/websocket_runner.rb
+++ b/
services/api/test/websocket_runner.rb
@@
-1,7
+1,12
@@
require 'bundler'
require 'bundler'
+require 'socket'
$ARV_API_SERVER_DIR = File.expand_path('../..', __FILE__)
$ARV_API_SERVER_DIR = File.expand_path('../..', __FILE__)
-SERVER_PID_PATH = 'tmp/pids/passenger.3002.pid'
+
+s = TCPServer.new('0.0.0.0', 0)
+WEBSOCKET_PORT = s.addr[1]
+s.close
+SERVER_PID_PATH = "tmp/pids/passenger.#{WEBSOCKET_PORT}.pid"
class WebsocketTestRunner < MiniTest::Unit
def _system(*cmd)
class WebsocketTestRunner < MiniTest::Unit
def _system(*cmd)
@@
-15,7
+20,7
@@
class WebsocketTestRunner < MiniTest::Unit
def _run(args=[])
server_pid = Dir.chdir($ARV_API_SERVER_DIR) do |apidir|
# Only passenger seems to be able to run the websockets server successfully.
def _run(args=[])
server_pid = Dir.chdir($ARV_API_SERVER_DIR) do |apidir|
# Only passenger seems to be able to run the websockets server successfully.
- _system('passenger', 'start', '-d',
'-p3002'
)
+ _system('passenger', 'start', '-d',
"-p#{WEBSOCKET_PORT}"
)
timeout = Time.now.tv_sec + 10
begin
sleep 0.2
timeout = Time.now.tv_sec + 10
begin
sleep 0.2
@@
-35,7
+40,7
@@
class WebsocketTestRunner < MiniTest::Unit
super(args)
ensure
Dir.chdir($ARV_API_SERVER_DIR) do
super(args)
ensure
Dir.chdir($ARV_API_SERVER_DIR) do
- _system('passenger', 'stop',
'-p3002'
)
+ _system('passenger', 'stop',
"-p#{WEBSOCKET_PORT}"
)
end
# DatabaseCleaner leaves the database empty. Prefer to leave it full.
dc = DatabaseController.new
end
# DatabaseCleaner leaves the database empty. Prefer to leave it full.
dc = DatabaseController.new