18941: Fix tests.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py
index 0b8e7c8f8bf2d4615209e0dbdbfd81e6e54b32af..fce48479a250cc9213d03732cec815509d117ab4 100644 (file)
--- 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 __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):
             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
             def __init__(self, blocks, nocache):
                 self.blocks = blocks
                 self.nocache = nocache

+                self.num_get_threads = 1

 
             def block_prefetch(self, loc):
                 pass
 
             def block_prefetch(self, loc):
                 pass

diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index a43e0d40dfe7ed48f5477689d3623afefe952ba3..e2d644b8676ba3a57acdccb148be1fd998826b40 100644 (file)
--- 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 __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):
             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 ece316193d4ee6a82cf04f6a685f09b0af453cf3..1601db59440be8b57c35b988869a1a56229ef92b 100644 (file)
--- 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()
 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'),
         super(MagicDirApiError, self).setUp(api=api)
         api.collections().get().execute.side_effect = iter([
             Exception('API fail'),