X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b046d1f162990361418a8e926aead5b307402a42..85c625c40ad873d0efac33f8a63c1ee256185e36:/apps/workbench/test/test_helper.rb diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb index 72b5a89e58..2e8ead94cd 100644 --- a/apps/workbench/test/test_helper.rb +++ b/apps/workbench/test/test_helper.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics" and ENV["RAILS_ENV"] != "performance") unless ENV["NO_COVERAGE_TEST"] @@ -22,7 +26,7 @@ end require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' -require 'mocha/mini_test' +require 'mocha/minitest' class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in @@ -35,7 +39,7 @@ class ActiveSupport::TestCase user_was = Thread.current[:user] token_was = Thread.current[:arvados_api_token] auth = api_fixture('api_client_authorizations')[token_name.to_s] - Thread.current[:arvados_api_token] = auth['api_token'] + Thread.current[:arvados_api_token] = "v2/#{auth['uuid']}/#{auth['api_token']}" if block_given? begin yield @@ -57,11 +61,11 @@ class ActiveSupport::TestCase end def self.reset_application_config - $application_config.each do |k,v| - if k.match /^[^.]*$/ - Rails.configuration.send (k + '='), v - end - end + # Restore configuration settings changed during tests + ConfigLoader.copy_into_config $arvados_config, Rails.configuration + ConfigLoader.copy_into_config $remaining_config, Rails.configuration + Rails.configuration.Services.Controller.ExternalURL = URI("https://#{ENV['ARVADOS_API_HOST']}") + Rails.configuration.TLS.Insecure = true end end @@ -81,15 +85,23 @@ module ApiFixtureLoader 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) + YAML.load(file).each do |name, ob| + ob.reject! { |k, v| k.start_with?('secret_') } + end end - keys.inject(@@api_fixtures[name]) { |hash, key| hash[key].deep_dup } + keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }.deep_dup end end + def api_fixture(name, *keys) self.class.api_fixture(name, *keys) end + def api_token(name) + auth = api_fixture('api_client_authorizations')[name] + "v2/#{auth['uuid']}/#{auth['api_token']}" + end + def find_fixture(object_class, name) object_class.find(api_fixture(object_class.to_s.pluralize.underscore, name, "uuid")) @@ -140,12 +152,13 @@ end class ActiveSupport::TestCase include ApiFixtureLoader def session_for api_client_auth_name + auth = api_fixture('api_client_authorizations')[api_client_auth_name.to_s] { - arvados_api_token: api_fixture('api_client_authorizations')[api_client_auth_name.to_s]['api_token'] + arvados_api_token: "v2/#{auth['uuid']}/#{auth['api_token']}" } end def json_response - Oj.load(@response.body) + Oj.safe_load(@response.body) end end @@ -171,38 +184,14 @@ class ApiServerForTests end def run_test_server - env_script = nil Dir.chdir PYTHON_TESTS_DIR do - # These are no-ops if we're running within run-tests.sh (except - # that we do get a useful env_script back from "start", even - # though it doesn't need to start up a new server). - env_script = check_output %w(python ./run_test_server.py start --auth admin) - check_output %w(python ./run_test_server.py start_arv-git-httpd) - check_output %w(python ./run_test_server.py start_keep-web) - check_output %w(python ./run_test_server.py start_nginx) - # This one isn't a no-op, even under run-tests.sh. check_output %w(python ./run_test_server.py start_keep) end - test_env = {} - env_script.each_line do |line| - line = line.chomp - if 0 == line.index('export ') - toks = line.sub('export ', '').split '=', 2 - $stderr.puts "run_test_server.py: #{toks[0]}=#{toks[1]}" - test_env[toks[0]] = toks[1] - end - end - test_env end def stop_test_server Dir.chdir PYTHON_TESTS_DIR do check_output %w(python ./run_test_server.py stop_keep) - # These are no-ops if we're running within run-tests.sh - check_output %w(python ./run_test_server.py stop_nginx) - check_output %w(python ./run_test_server.py stop_arv-git-httpd) - check_output %w(python ./run_test_server.py stop_keep-web) - check_output %w(python ./run_test_server.py stop) end @@server_is_running = false end @@ -217,10 +206,7 @@ class ApiServerForTests stop_test_server end - test_env = run_test_server - $application_config['arvados_login_base'] = "https://#{test_env['ARVADOS_API_HOST']}/login" - $application_config['arvados_v1_base'] = "https://#{test_env['ARVADOS_API_HOST']}/arvados/v1" - $application_config['arvados_insecure_host'] = true + run_test_server ActiveSupport::TestCase.reset_application_config @@server_is_running = true @@ -303,7 +289,7 @@ class ActiveSupport::TestCase def after_teardown if self.class.want_reset_api_fixtures[:after_each_test] and - @want_reset_api_fixtures != false + (!defined?(@want_reset_api_fixtures) or @want_reset_api_fixtures != false) self.class.reset_api_fixtures_now end super @@ -320,7 +306,7 @@ class ActiveSupport::TestCase return unless Rails.env == 'test' auth = api_fixture('api_client_authorizations')['admin_trustedclient'] - Thread.current[:arvados_api_token] = auth['api_token'] + Thread.current[:arvados_api_token] = "v2/#{auth['uuid']}/#{auth['api_token']}" ArvadosApiClient.new.api(nil, '../../database/reset', {}) Thread.current[:arvados_api_token] = nil end @@ -362,3 +348,30 @@ end # Reset fixtures now (i.e., before any tests run). ActiveSupport::TestCase.reset_api_fixtures_now + +module Minitest + class Test + def capture_exceptions *args + begin + n = 0 + begin + yield + rescue *PASSTHROUGH_EXCEPTIONS + raise + rescue Exception => e + n += 1 + raise if n > 2 || e.is_a?(Skip) + STDERR.puts "Test failed, retrying (##{n})" + ActiveSupport::TestCase.reset_api_fixtures_now + retry + end + rescue *PASSTHROUGH_EXCEPTIONS + raise + rescue Assertion => e + self.failures << e + rescue Exception => e + self.failures << UnexpectedError.new(e) + end + end + end +end