14262: Fix spillover of tests changing remote_hosts

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index 0fafb990366de4c309fc67475542e7e570401005..f53b07e5a59d1f10785c7673e6fa0fd0584a8820 100644 (file)
--- 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 fc6a97cf7480c645206c867e3449822bfcfa41a5..41e2adb9c3d35a2a6d52f9244b666913eff3e1d5 100644 (file)
--- 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")