[ARVADOS] updated: 2.1.0-2176-gaac0a284e

[Git user]

Summary of changes:
 sdk/python/tests/test_arvfile.py     | 3 ++-
 sdk/python/tests/test_collections.py | 2 +-
 services/fuse/tests/test_mount.py    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

       via  aac0a284e71ab62b2537a6fdeab6d736deb9a1a9 (commit)
      from  33e4f1574f5bd14784c65863739478ff864732d2 (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 aac0a284e71ab62b2537a6fdeab6d736deb9a1a9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Mar 29 22:55:35 2022 -0400

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

diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py
index 0b8e7c8f8..fce48479a 100644
--- a/sdk/python/tests/test_arvfile.py
+++ b/sdk/python/tests/test_arvfile.py
@@ -27,7 +27,7 @@ class ArvadosFileWriterTestCase(unittest.TestCase):
         def __init__(self, blocks):
             self.blocks = blocks
             self.requests = []
-        def get(self, locator, num_retries=0):
+        def get(self, locator, num_retries=0, cache_slot_get=None):
             self.requests.append(locator)
             return self.blocks.get(locator)
         def get_from_cache(self, locator):
@@ -627,6 +627,7 @@ class ArvadosFileReaderTestCase(StreamFileReaderTestCase):
             def __init__(self, blocks, nocache):
                 self.blocks = blocks
                 self.nocache = nocache
+                self.num_get_threads = 1
 
             def block_prefetch(self, loc):
                 pass
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index a43e0d40d..e2d644b86 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -320,7 +320,7 @@ class ArvadosCollectionsTest(run_test_server.TestCaseWithServers,
         def __init__(self, content, num_retries=0):
             self.content = content
 
-        def get(self, locator, num_retries=0):
+        def get(self, locator, num_retries=0, cache_slot_get=None):
             return self.content[locator]
 
     def test_stream_reader(self):
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index ece316193..1601db594 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -1088,6 +1088,7 @@ class FuseFsyncTest(FuseMagicTest):
 class MagicDirApiError(FuseMagicTest):
     def setUp(self):
         api = mock.MagicMock()
+        api.keep.block_cache = mock.MagicMock(cache_max=1)
         super(MagicDirApiError, self).setUp(api=api)
         api.collections().get().execute.side_effect = iter([
             Exception('API fail'),

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


hooks/post-receive
--