X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d9d74825806615a539da950686ae801bbbf60e24..13efb6304b9fcbe0fd3b496c751184c7aa1cc4d0:/apps/workbench/test/test_helper.rb diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb index 1195798312..4fd5aafb47 100644 --- a/apps/workbench/test/test_helper.rb +++ b/apps/workbench/test/test_helper.rb @@ -36,10 +36,18 @@ class ActiveSupport::TestCase Thread.current[:arvados_api_token] = auth['api_token'] end - def teardown + teardown do Thread.current[:arvados_api_token] = nil + Thread.current[:user] = nil Thread.current[:reader_tokens] = nil - super + # 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 /^[^.]*$/ + Rails.configuration.send (k + '='), v + end + end end end @@ -50,18 +58,27 @@ module ApiFixtureLoader module ClassMethods @@api_fixtures = {} - def api_fixture(name) + def api_fixture(name, *keys) # Returns the data structure from the named API server test fixture. @@api_fixtures[name] ||= \ 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 end - def api_fixture name - self.class.api_fixture name + def api_fixture(name, *keys) + self.class.api_fixture(name, *keys) + end + + def find_fixture(object_class, name) + object_class.find(api_fixture(object_class.to_s.pluralize.underscore, + name, "uuid")) end end @@ -80,18 +97,19 @@ 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', @@ -101,42 +119,55 @@ class ApiServerForTests 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(@pidfile).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") + + @pidfile = if @websocket + WEBSOCKET_PID_PATH + else + SERVER_PID_PATH + end + # 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', @pidfile) + 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', @pidfile, + '--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) @@ -173,6 +204,51 @@ class ActionController::TestCase end end +# Test classes can call reset_api_fixtures(:before_suite) or +# ...(:after_suite) +class ActiveSupport::TestCase + class << self + attr_accessor :want_reset_api_fixtures + end + + def self.reset_api_fixtures where, t=true + raise unless [:before_suite, :after_suite].include? where + self.want_reset_api_fixtures ||= {} + self.want_reset_api_fixtures[where] = t + end + + def self.run *args + self.want_reset_api_fixtures ||= {} + reset_api_fixtures_now if want_reset_api_fixtures[:before_suite] + super + reset_api_fixtures_now if want_reset_api_fixtures[:after_suite] + end + + protected + def self.reset_api_fixtures_now + auth = api_fixture('api_client_authorizations')['admin_trustedclient'] + Thread.current[:arvados_api_token] = auth['api_token'] + ArvadosApiClient.new.api(nil, '../../database/reset', {}) + Thread.current[:arvados_api_token] = nil + end +end + +# If it quacks like a duck, it must be a HTTP request object. +class RequestDuck + def self.host + "localhost" + end + + def self.port + 8080 + end + + def self.protocol + "http" + end +end + if ENV["RAILS_ENV"].eql? 'test' - ApiServerForTests.run + ApiServerForTests.new.run + ApiServerForTests.new.run ["--websockets"] end