[arvados] updated: 2.7.0-6011-g77d35baf5d

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py |  1 +
 sdk/cwl/tests/test_container.py | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

       via  77d35baf5dedff40f4d198c826c84be1502479e1 (commit)
      from  0f9d5cc0b9a83c99ebc1c63fd24b539bc37bbb63 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 77d35baf5dedff40f4d198c826c84be1502479e1
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Feb 22 14:59:12 2024 -0500

    19744: Fix existing tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 2c0120793f..8facc9f380 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -146,6 +146,7 @@ class ArvCwlExecutor(object):
         self.stdout = stdout
         self.fast_submit = False
         self.git_info = arvargs.git_info
+        self.debug = False
 
         if keep_client is not None:
             self.keep_client = keep_client
diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index 8e3a8ab85e..440fead870 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -651,11 +651,14 @@ class TestContainer(unittest.TestCase):
             "properties": {}
         })
 
-        rts_mock.assert_called_with(
-            'error',
-            'arvados.cwl-runner: [container testjob] (zzzzz-xvhdp-zzzzzzzzzzzzzzz) error log:',
-            '  ** log is empty **'
-        )
+        rts_mock.assert_has_calls([
+            mock.call('error',
+                      'arvados.cwl-runner: [container testjob] (zzzzz-xvhdp-zzzzzzzzzzzzzzz) error log:',
+                      '  ** log is empty **'
+                      ),
+            mock.call('warning',
+                      'arvados.cwl-runner: [container testjob] unable to generate resource usage report'
+        )])
         arvjob.output_callback.assert_called_with({"out": "stuff"}, "permanentFail")
 
     # The test passes no builder.resources

-----------------------------------------------------------------------


hooks/post-receive
--