X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/60501a83ead2f3c71144d3af842e714cb3f91000..02f24a0c4a01a7ab46645c21630b9f48065b4b96:/apps/workbench/test/test_helper.rb diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb index fdde55d41d..60dadec61d 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"] @@ -31,20 +35,22 @@ class ActiveSupport::TestCase # Note: You'll currently still have to declare fixtures explicitly # in integration tests -- they do not yet inherit this setting fixtures :all - def use_token token_name - was = Thread.current[:arvados_api_token] + def use_token(token_name) + 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'] if block_given? begin yield ensure - Thread.current[:arvados_api_token] = was + Thread.current[:user] = user_was + Thread.current[:arvados_api_token] = token_was end end end - setup do + teardown do Thread.current[:arvados_api_token] = nil Thread.current[:user] = nil Thread.current[:reader_tokens] = nil @@ -79,9 +85,11 @@ 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] } + keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }.deep_dup end end def api_fixture(name, *keys) @@ -95,22 +103,40 @@ module ApiFixtureLoader end module ApiMockHelpers - def stub_api_calls_with_body body, status_code=200 + def fake_api_response body, status_code, headers resp = mock - stubbed_client = ArvadosApiClient.new - stubbed_client.instance_eval do - resp.responds_like_instance_of HTTP::Message - resp.stubs(:content).returns body - resp.stubs(:status_code).returns status_code + resp.responds_like_instance_of HTTP::Message + resp.stubs(:headers).returns headers + resp.stubs(:content).returns body + resp.stubs(:status_code).returns status_code + resp + end + + def stub_api_calls_with_body body, status_code=200, headers={} + stub_api_calls + resp = fake_api_response body, status_code, headers + stub_api_client.stubs(:post).returns resp + end + + def stub_api_calls + @stubbed_client = ArvadosApiClient.new + @stubbed_client.instance_eval do @api_client = HTTPClient.new - @api_client.stubs(:post).returns resp end - ArvadosApiClient.stubs(:new_or_current).returns(stubbed_client) + ArvadosApiClient.stubs(:new_or_current).returns(@stubbed_client) end def stub_api_calls_with_invalid_json stub_api_calls_with_body ']"omg,bogus"[' end + + # Return the HTTPClient mock used by the ArvadosApiClient mock. You + # must have called stub_api_calls first. + def stub_api_client + @stubbed_client.instance_eval do + @api_client + end + end end class ActiveSupport::TestCase @@ -137,7 +163,7 @@ class ApiServerForTests @main_process_pid = $$ @@server_is_running = false - def check_call *args + def check_output *args output = nil Bundler.with_clean_env do output = IO.popen *args do |io| @@ -153,7 +179,15 @@ class ApiServerForTests def run_test_server env_script = nil Dir.chdir PYTHON_TESTS_DIR do - env_script = check_call %w(python ./run_test_server.py start --auth admin) + # 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| @@ -169,8 +203,12 @@ class ApiServerForTests def stop_test_server Dir.chdir PYTHON_TESTS_DIR do - # This is a no-op if we're running within run-tests.sh - check_call %w(python ./run_test_server.py stop) + 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 @@ -196,19 +234,19 @@ class ApiServerForTests def run_rake_task task_name, arg_string Dir.chdir ARV_API_SERVER_DIR do - check_call ['bundle', 'exec', 'rake', "#{task_name}[#{arg_string}]"] + check_output ['bundle', 'exec', 'rake', "#{task_name}[#{arg_string}]"] end end end class ActionController::TestCase setup do - @counter = 0 + @test_counter = 0 end def check_counter action - @counter += 1 - if @counter == 2 + @test_counter += 1 + if @test_counter == 2 assert_equal 1, 2, "Multiple actions in controller test" end end @@ -270,12 +308,17 @@ class ActiveSupport::TestCase end def after_teardown - if self.class.want_reset_api_fixtures[:after_each_test] + if self.class.want_reset_api_fixtures[:after_each_test] and + @want_reset_api_fixtures != false self.class.reset_api_fixtures_now end super end + def reset_api_fixtures_after_test t=true + @want_reset_api_fixtures = t + end + protected def self.reset_api_fixtures_now # Never try to reset fixtures when we're just using test