X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f608029e1aec903bc35a4748ef51e6f076dae0aa..e54662c069d72c7a22f89bd889370703790d2536:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index ece316193d..b3bec39cc5 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -6,7 +6,9 @@ from __future__ import absolute_import from future.utils import viewitems from builtins import str from builtins import object +from pathlib import Path from six import assertRegex +import errno import json import llfuse import logging @@ -16,9 +18,11 @@ import subprocess import time import unittest import tempfile +import parameterized import arvados import arvados_fuse as fuse +from arvados_fuse import fusedir from . import run_test_server from .integration_test import IntegrationTest @@ -54,7 +58,7 @@ class AssertWithTimeout(object): else: self.done = True - +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMountTest(MountTestBase): def setUp(self): super(FuseMountTest, self).setUp() @@ -125,6 +129,7 @@ class FuseMountTest(MountTestBase): self.assertEqual(v, f.read().decode()) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMagicTest(MountTestBase): def setUp(self, api=None): super(FuseMagicTest, self).setUp(api=api) @@ -283,6 +288,7 @@ def fuseSharedTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseSharedTest(MountTestBase): def runTest(self): self.make_mount(fuse.SharedDirectory, @@ -343,6 +349,7 @@ def fuseModifyFileTestHelperReadEndContents(mounttmp): self.assertEqual("plnp", f.read()) Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseModifyFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -363,6 +370,7 @@ class FuseModifyFileTest(MountTestBase): self.pool.apply(fuseModifyFileTestHelperReadEndContents, (self.mounttmp,)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseAddFileToCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -385,6 +393,7 @@ class FuseAddFileToCollectionTest(MountTestBase): self.assertEqual(["file1.txt", "file2.txt"], sorted(d1)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseRemoveFileFromCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -416,6 +425,7 @@ def fuseCreateFileTestHelper(mounttmp): pass Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseCreateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -459,6 +469,7 @@ def fuseWriteFileTestHelperReadFile(mounttmp): self.assertEqual(f.read(), "Hello world!") Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseWriteFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -507,6 +518,7 @@ def fuseUpdateFileTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseUpdateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -1088,6 +1100,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'), @@ -1113,7 +1126,10 @@ class MagicDirApiError(FuseMagicTest): class SanitizeFilenameTest(MountTestBase): def test_sanitize_filename(self): - pdir = fuse.ProjectDirectory(1, {}, self.api, 0, False, project_object=self.api.users().current().execute()) + pdir = fuse.ProjectDirectory( + 1, fuse.Inodes(None), self.api, 0, False, None, + project_object=self.api.users().current().execute(), + ) acceptable = [ "foo.txt", ".foo", @@ -1211,20 +1227,22 @@ class SlashSubstitutionTest(IntegrationTest): mnt_args = [ '--read-write', '--mount-home', 'zzz', + '--fsns', '[SLASH]' ] def setUp(self): super(SlashSubstitutionTest, self).setUp() - self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) - self.api.config = lambda: {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + + self.api = arvados.safeapi.ThreadSafeApiCache( + arvados.config.settings(), + version='v1' + ) self.testcoll = self.api.collections().create(body={"name": "foo/bar/baz"}).execute() self.testcolleasy = self.api.collections().create(body={"name": "foo-bar-baz"}).execute() self.fusename = 'foo[SLASH]bar[SLASH]baz' @IntegrationTest.mount(argv=mnt_args) - @mock.patch('arvados.util.get_config_once') - def test_slash_substitution_before_listing(self, get_config_once): - get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + def test_slash_substitution_before_listing(self): self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) self.checkContents() @staticmethod @@ -1274,7 +1292,10 @@ class StorageClassesTest(IntegrationTest): def setUp(self): super(StorageClassesTest, self).setUp() - self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + self.api = arvados.safeapi.ThreadSafeApiCache( + arvados.config.settings(), + version='v1', + ) @IntegrationTest.mount(argv=mnt_args) def test_collection_default_storage_classes(self): @@ -1311,7 +1332,110 @@ class ReadonlyCollectionTest(MountTestBase): def runTest(self): settings = arvados.config.settings().copy() settings["ARVADOS_API_TOKEN"] = run_test_server.fixture("api_client_authorizations")["project_viewer"]["api_token"] - self.api = arvados.safeapi.ThreadSafeApiCache(settings) + self.api = arvados.safeapi.ThreadSafeApiCache(settings, version='v1') self.make_mount(fuse.CollectionDirectory, collection_record=self.testcollection, enable_write=False) self.pool.apply(_readonlyCollectionTestHelper, (self.mounttmp,)) + + +@parameterized.parameterized_class([ + {'root_class': fusedir.ProjectDirectory, 'root_kwargs': { + 'project_object': run_test_server.fixture('users')['admin'], + }}, + {'root_class': fusedir.ProjectDirectory, 'root_kwargs': { + 'project_object': run_test_server.fixture('groups')['public'], + }}, +]) +class UnsupportedCreateTest(MountTestBase): + root_class = None + root_kwargs = {} + + def setUp(self): + super().setUp() + if 'prefs' in self.root_kwargs.get('project_object', ()): + self.root_kwargs['project_object']['prefs'] = {} + self.make_mount(self.root_class, **self.root_kwargs) + # Make sure the directory knows about its top-level ents. + os.listdir(self.mounttmp) + + def test_create(self): + test_path = Path(self.mounttmp, 'test_create') + with self.assertRaises(OSError) as exc_check: + with test_path.open('w'): + pass + self.assertEqual(exc_check.exception.errno, errno.ENOTSUP) + + +# FIXME: IMO, for consistency with the "create inside a project" case, +# these operations should also return ENOTSUP instead of EPERM. +# Right now they're returning EPERM because the clasess' writable() method +# usually returns False, and the Operations class transforms that accordingly. +# However, for cases where the mount will never be writable, I think ENOTSUP +# is a clearer error: it lets the user know they can't fix the problem by +# adding permissions in Arvados, etc. +@parameterized.parameterized_class([ + {'root_class': fusedir.MagicDirectory, + 'preset_dir': 'by_id', + 'preset_file': 'README', + }, + + {'root_class': fusedir.SharedDirectory, + 'root_kwargs': { + 'exclude': run_test_server.fixture('users')['admin']['uuid'], + }, + 'preset_dir': 'Active User', + }, + + {'root_class': fusedir.TagDirectory, + 'root_kwargs': { + 'tag': run_test_server.fixture('links')['foo_collection_tag']['name'], + }, + 'preset_dir': run_test_server.fixture('collections')['foo_collection_in_aproject']['uuid'], + }, + + {'root_class': fusedir.TagsDirectory, + 'preset_dir': run_test_server.fixture('links')['foo_collection_tag']['name'], + }, +]) +class UnsupportedOperationsTest(UnsupportedCreateTest): + preset_dir = None + preset_file = None + + def test_create(self): + test_path = Path(self.mounttmp, 'test_create') + with self.assertRaises(OSError) as exc_check: + with test_path.open('w'): + pass + self.assertEqual(exc_check.exception.errno, errno.EPERM) + + def test_mkdir(self): + test_path = Path(self.mounttmp, 'test_mkdir') + with self.assertRaises(OSError) as exc_check: + test_path.mkdir() + self.assertEqual(exc_check.exception.errno, errno.EPERM) + + def test_rename(self): + src_name = self.preset_dir or self.preset_file + if src_name is None: + return + test_src = Path(self.mounttmp, src_name) + test_dst = test_src.with_name('test_dst') + with self.assertRaises(OSError) as exc_check: + test_src.rename(test_dst) + self.assertEqual(exc_check.exception.errno, errno.EPERM) + + def test_rmdir(self): + if self.preset_dir is None: + return + test_path = Path(self.mounttmp, self.preset_dir) + with self.assertRaises(OSError) as exc_check: + test_path.rmdir() + self.assertEqual(exc_check.exception.errno, errno.EPERM) + + def test_unlink(self): + if self.preset_file is None: + return + test_path = Path(self.mounttmp, self.preset_file) + with self.assertRaises(OSError) as exc_check: + test_path.unlink() + self.assertEqual(exc_check.exception.errno, errno.EPERM)