From 7f223f48c24dfa8c3d8247f8e48656a5edca7ea5 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 31 Oct 2018 12:53:25 -0400 Subject: [PATCH] 14262: Fix spillover of tests changing remote_hosts Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- services/api/test/unit/container_request_test.rb | 9 +++++++-- services/api/test/unit/job_test.rb | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb index 0fafb99036..f53b07e5a5 100644 --- a/services/api/test/unit/container_request_test.rb +++ b/services/api/test/unit/container_request_test.rb @@ -506,6 +506,7 @@ class ContainerRequestTest < ActiveSupport::TestCase ].each do |img| test "container_image_for_container(#{img.inspect}) => 422" do set_user_from_auth :active + Rails.configuration.remote_hosts = {} assert_raises(ArvadosModel::UnresolvableContainerError) do Container.resolve_container_image(img) end @@ -514,8 +515,12 @@ class ContainerRequestTest < ActiveSupport::TestCase test "allow unrecognized container when there are remote_hosts" do set_user_from_auth :active - Rails.configuration.remote_hosts = {"foooo" => "bar.com"} - Container.resolve_container_image('acbd18db4cc2f85cedef654fccc4a4d8+3') + begin + Rails.configuration.remote_hosts = {"foooo" => "bar.com"} + Container.resolve_container_image('acbd18db4cc2f85cedef654fccc4a4d8+3') + ensure + Rails.configuration.remote_hosts = {} + end end test "migrated docker image" do diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb index fc6a97cf74..41e2adb9c3 100644 --- a/services/api/test/unit/job_test.rb +++ b/services/api/test/unit/job_test.rb @@ -127,6 +127,7 @@ class JobTest < ActiveSupport::TestCase 'locator' => BAD_COLLECTION, }.each_pair do |spec_type, image_spec| test "Job validation fails with nonexistent Docker image #{spec_type}" do + Rails.configuration.remote_hosts = {} job = Job.new job_attrs(runtime_constraints: {'docker_image' => image_spec}) assert(job.invalid?, "nonexistent Docker image #{spec_type} was valid") -- 2.30.2