Thread.current[:arvados_api_token] = nil
Thread.current[:user] = nil
Thread.current[:reader_tokens] = nil
- Rails.cache.clear
+ # Diagnostics suite doesn't run a server, so there's no cache to clear.
+ Rails.cache.clear unless (Rails.env == "diagnostics")
# Restore configuration settings changed during tests
$application_config.each do |k,v|
if k.match /^[^.]*$/
begin
path = File.join(ApiServerForTests::ARV_API_SERVER_DIR,
'test', 'fixtures', "#{name}.yml")
- YAML.load(IO.read(path))
+ file = IO.read(path)
+ trim_index = file.index('# Test Helper trims the rest of the file')
+ file = file[0, trim_index] if trim_index
+ YAML.load(file)
end
keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }
end
class ApiServerForTests
ARV_API_SERVER_DIR = File.expand_path('../../../../services/api', __FILE__)
SERVER_PID_PATH = File.expand_path('tmp/pids/wbtest-server.pid', ARV_API_SERVER_DIR)
+ WEBSOCKET_PID_PATH = File.expand_path('tmp/pids/wstest-server.pid', ARV_API_SERVER_DIR)
@main_process_pid = $$
- def self._system(*cmd)
+ def _system(*cmd)
$stderr.puts "_system #{cmd.inspect}"
Bundler.with_clean_env do
- if not system({'RAILS_ENV' => 'test'}, *cmd)
+ if not system({'RAILS_ENV' => 'test', "ARVADOS_WEBSOCKETS" => (if @websocket then "ws-only" end)}, *cmd)
raise RuntimeError, "#{cmd[0]} returned exit code #{$?.exitstatus}"
end
end
end
- def self.make_ssl_cert
+ def make_ssl_cert
unless File.exists? './self-signed.key'
_system('openssl', 'req', '-new', '-x509', '-nodes',
'-out', './self-signed.pem',
end
end
- def self.kill_server
+ def kill_server
if (pid = find_server_pid)
$stderr.puts "Sending TERM to API server, pid #{pid}"
Process.kill 'TERM', pid
end
end
- def self.find_server_pid
+ def find_server_pid
pid = nil
begin
- pid = IO.read(SERVER_PID_PATH).to_i
+ pid = IO.read(if @websocket then WEBSOCKET_PID_PATH else SERVER_PID_PATH end).to_i
$stderr.puts "API server is running, pid #{pid.inspect}"
rescue Errno::ENOENT
end
return pid
end
- def self.run(args=[])
+ def run(args=[])
::MiniTest.after_run do
self.kill_server
end
+ @websocket = args.include?("--websockets")
+
# Kill server left over from previous test run
self.kill_server
Capybara.javascript_driver = :poltergeist
Dir.chdir(ARV_API_SERVER_DIR) do |apidir|
ENV["NO_COVERAGE_TEST"] = "1"
- make_ssl_cert
- _system('bundle', 'exec', 'rake', 'db:test:load')
- _system('bundle', 'exec', 'rake', 'db:fixtures:load')
- _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
- '--pid-file', SERVER_PID_PATH,
- '--ssl',
- '--ssl-certificate', 'self-signed.pem',
- '--ssl-certificate-key', 'self-signed.key')
+ if @websocket
+ _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3333',
+ '--pid-file', WEBSOCKET_PID_PATH)
+ else
+ make_ssl_cert
+ _system('bundle', 'exec', 'rake', 'db:test:load')
+ _system('bundle', 'exec', 'rake', 'db:fixtures:load')
+ _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
+ '--pid-file', SERVER_PID_PATH,
+ '--ssl',
+ '--ssl-certificate', 'self-signed.pem',
+ '--ssl-certificate-key', 'self-signed.key')
+ end
timeout = Time.now.tv_sec + 10
good_pid = false
while (not good_pid) and (Time.now.tv_sec < timeout)
end
if ENV["RAILS_ENV"].eql? 'test'
- ApiServerForTests.run
+ ApiServerForTests.new.run
+ ApiServerForTests.new.run ["--websockets"]
end