7475: Merge branch 'master' into 7475-nodemgr-unsatisfiable-job-comms

[arvados.git] / sdk / cli / test / test_crunch-job.rb

diff --git a/sdk/cli/test/test_crunch-job.rb b/sdk/cli/test/test_crunch-job.rb
index 847f994f486842b69ad2436ea767649cfb1a0c64..c1465d8d69feb447b5d521dad70e7d0c262e9182 100644 (file)
--- a/sdk/cli/test/test_crunch-job.rb
+++ b/sdk/cli/test/test_crunch-job.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 require 'minitest/autorun'
 
 class TestCrunchJob < Minitest::Test
@@ -92,14 +96,14 @@ class TestCrunchJob < Minitest::Test
       tryjobrecord j, binstubs: ['clean_fail']
     end
     assert_match /Failing mount stub was called/, err
-    assert_match /clean work dirs: exit 44\n$/, err
+    assert_match /clean work dirs: exit 44\n.*Transient failure.* exiting 93\n(.*arv_put.*INFO.*\n)?$/, err
     assert_equal SPECIAL_EXIT[:EX_RETRY_UNLOCKED], $?.exitstatus
   end
 
   def test_output_collection_owner_uuid
     j = jobspec :grep_local
     out, err = capture_subprocess_io do
-      tryjobrecord j, binstubs: ['output_coll_owner']
+      tryjobrecord j, binstubs: ['arv-mount', 'output_coll_owner']
     end
     assert_match /owner_uuid: #{j['owner_uuid']}/, err
   end
@@ -120,7 +124,7 @@ class TestCrunchJob < Minitest::Test
     out, err = capture_subprocess_io do
       j = jobspec :grep_local
       j[:script_version] = bogus_version
-      tryjobrecord j
+      tryjobrecord j, binstubs: ['arv-mount']
     end
     assert_match /'#{bogus_version}' not found, giving up/, err
     assert_jobfail $?