X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08078f621c8dbc1ecbd6e030bb0fac848cb6a01c..65e6fa3de6c5e921e30044c66ed494456d965c59:/services/fuse/tests/mount_test_base.py diff --git a/services/fuse/tests/mount_test_base.py b/services/fuse/tests/mount_test_base.py index e82660408b..8a3522e0cb 100644 --- a/services/fuse/tests/mount_test_base.py +++ b/services/fuse/tests/mount_test_base.py @@ -54,7 +54,11 @@ class MountTestBase(unittest.TestCase): run_test_server.run() run_test_server.authorize_with("admin") - self.api = api if api else arvados.safeapi.ThreadSafeApiCache(arvados.config.settings(), keep_params={"block_cache": make_block_cache(self.disk_cache)}) + self.api = api if api else arvados.safeapi.ThreadSafeApiCache( + arvados.config.settings(), + keep_params={"block_cache": make_block_cache(self.disk_cache)}, + version='v1', + ) self.llfuse_thread = None # This is a copy of Mount's method. TODO: Refactor MountTestBase @@ -68,15 +72,22 @@ class MountTestBase(unittest.TestCase): llfuse.close() def make_mount(self, root_class, **root_kwargs): - enable_write = True - if 'enable_write' in root_kwargs: - enable_write = root_kwargs.pop('enable_write') + enable_write = root_kwargs.pop('enable_write', True) self.operations = fuse.Operations( - os.getuid(), os.getgid(), + os.getuid(), + os.getgid(), api_client=self.api, - enable_write=enable_write) + enable_write=enable_write, + ) self.operations.inodes.add_entry(root_class( - llfuse.ROOT_INODE, self.operations.inodes, self.api, 0, enable_write, **root_kwargs)) + llfuse.ROOT_INODE, + self.operations.inodes, + self.api, + 0, + enable_write, + root_kwargs.pop('filters', None), + **root_kwargs, + )) llfuse.init(self.operations, self.mounttmp, []) self.llfuse_thread = threading.Thread(None, lambda: self._llfuse_main()) self.llfuse_thread.daemon = True