Merge branch 'master' into 6859-fix-invalid-manifests

[arvados.git] / services / api / test / unit / salvage_collection_test.rb

diff --git a/services/api/test/unit/salvage_collection_test.rb b/services/api/test/unit/salvage_collection_test.rb
index 09ab6cfac089ee70c216505377667e27d9d75a3e..3efe0370b14e3788ecfd831d08060bdf329e910b 100644 (file)
--- a/services/api/test/unit/salvage_collection_test.rb
+++ b/services/api/test/unit/salvage_collection_test.rb
@@ -20,7 +20,7 @@ module Kernel
   end
 
   def exit code
-    raise "Exit code #{code}" if code != 0
+    raise "Exit code #{code}" if code == 200
   end
 end
 
@@ -34,6 +34,11 @@ class SalvageCollectionTest < ActiveSupport::TestCase
     ENV['ARVADOS_API_TOKEN'] = 'unused_by_test'
   end
 
+  teardown do
+    ENV['ARVADOS_API_HOST'] = ''
+    ENV['ARVADOS_API_TOKEN'] = ''
+  end
+
   test "salvage test collection" do
     # create a collection to test salvaging
     src_collection = Collection.new name: "test collection", manifest_text: TEST_MANIFEST
@@ -81,7 +86,7 @@ class SalvageCollectionTest < ActiveSupport::TestCase
       ENV['ARVADOS_API_TOKEN'] = ''
       SalvageCollection.salvage_collection collections('user_agreement').uuid
     rescue => e
-      assert_equal "Exit code 1", e.message
+      assert_equal "Exit code 200", e.message
       exited = true
     end
     assert_equal true, exited