[ARVADOS] updated: 2.1.0-630-gaaf66379f

[Git user]

Summary of changes:
 sdk/cwl/tests/test_container.py | 2 ++
 sdk/cwl/tests/test_submit.py    | 2 ++
 2 files changed, 4 insertions(+)

       via  aaf66379f989120c23eed4fb4a5e6c875362c6dc (commit)
      from  4aa95be0abb99cdd2aa1317bf5ec350af412e595 (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 aaf66379f989120c23eed4fb4a5e6c875362c6dc
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Apr 13 15:23:26 2021 -0400

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

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index d331e3552..b8f9ac682 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -905,6 +905,8 @@ class TestWorkflow(unittest.TestCase):
         loadingContext, runtimeContext = self.helper(runner)
         runner.fs_access = runtimeContext.make_fs_access(runtimeContext.basedir)
 
+        mockcollectionreader().exists.return_value = True
+
         tool, metadata = loadingContext.loader.resolve_ref("tests/wf/scatter2.cwl")
         metadata["cwlVersion"] = tool["cwlVersion"]
 
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 7aaa27fd6..2bee865db 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -655,6 +655,7 @@ class TestSubmit(unittest.TestCase):
     @mock.patch("time.sleep")
     @stubs
     def test_submit_file_keepref(self, stubs, tm, collectionReader):
+        collectionReader().exists.return_value = True
         collectionReader().find.return_value = arvados.arvfile.ArvadosFile(mock.MagicMock(), "blorp.txt")
         exited = arvados_cwl.main(
             ["--submit", "--no-wait", "--api=containers", "--debug",
@@ -1264,6 +1265,7 @@ class TestSubmit(unittest.TestCase):
     @mock.patch("arvados.collection.CollectionReader")
     @stubs
     def test_submit_uuid_inputs(self, stubs, collectionReader):
+        collectionReader().exists.return_value = True
         collectionReader().find.return_value = arvados.arvfile.ArvadosFile(mock.MagicMock(), "file1.txt")
         def list_side_effect(**kwargs):
             m = mock.MagicMock()

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


hooks/post-receive
--