X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9df977af1ca8d7fe942cbe13956fa19ed88b91d..a00c5d23c9f132e9ed1460d19a29a003322a067a:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index f623ae5386..2652142fd9 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -1,24 +1,25 @@ -import arvados -import arvados.safeapi -import arvados_fuse as fuse -import glob +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +from __future__ import absolute_import +from future.utils import viewitems +from builtins import str +from builtins import object import json import llfuse +import logging +import mock import os -import shutil import subprocess -import sys -import tempfile -import threading import time import unittest -import logging -import multiprocessing -import run_test_server -import mock -import re -from mount_test_base import MountTestBase +import arvados +import arvados_fuse as fuse +from . import run_test_server + +from .mount_test_base import MountTestBase logger = logging.getLogger('arvados.arv-mount') @@ -34,7 +35,7 @@ class AssertWithTimeout(object): self.done = False return self - def next(self): + def __next__(self): if self.done: raise StopIteration return self.attempt @@ -81,11 +82,11 @@ class FuseMountTest(MountTestBase): cw.write("data 8") cw.start_new_stream('edgecases') - for f in ":/.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/ ".split("/"): cw.start_new_file(f) cw.write('x') - for f in ":/.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/ ".split("/"): cw.start_new_stream('edgecases/dirs/' + f) cw.start_new_file('x/x') cw.write('x') @@ -102,9 +103,9 @@ class FuseMountTest(MountTestBase): self.assertDirContents('dir2', ['thing5.txt', 'thing6.txt', 'dir3']) self.assertDirContents('dir2/dir3', ['thing7.txt', 'thing8.txt']) self.assertDirContents('edgecases', - "dirs/:/.../-/*/\x01\\/ ".split("/")) + "dirs/:/.../-/*/ ".split("/")) self.assertDirContents('edgecases/dirs', - ":/.../-/*/\x01\\/ ".split("/")) + ":/.../-/*/ ".split("/")) files = {'thing1.txt': 'data 1', 'thing2.txt': 'data 2', @@ -115,33 +116,19 @@ class FuseMountTest(MountTestBase): 'dir2/dir3/thing7.txt': 'data 7', 'dir2/dir3/thing8.txt': 'data 8'} - for k, v in files.items(): + for k, v in viewitems(files): with open(os.path.join(self.mounttmp, k)) as f: self.assertEqual(v, f.read()) -class FuseNoAPITest(MountTestBase): - def setUp(self): - super(FuseNoAPITest, self).setUp() - keep = arvados.keep.KeepClient(local_store=self.keeptmp) - self.file_data = "API-free text\n" - self.file_loc = keep.put(self.file_data) - self.coll_loc = keep.put(". {} 0:{}:api-free.txt\n".format( - self.file_loc, len(self.file_data))) - - def runTest(self): - self.make_mount(fuse.MagicDirectory) - self.assertDirContents(self.coll_loc, ['api-free.txt']) - with open(os.path.join( - self.mounttmp, self.coll_loc, 'api-free.txt')) as keep_file: - actual = keep_file.read(-1) - self.assertEqual(self.file_data, actual) - - class FuseMagicTest(MountTestBase): def setUp(self, api=None): super(FuseMagicTest, self).setUp(api=api) + self.test_project = run_test_server.fixture('groups')['aproject']['uuid'] + self.non_project_group = run_test_server.fixture('groups')['public']['uuid'] + self.collection_in_test_project = run_test_server.fixture('collections')['foo_collection_in_aproject']['name'] + cw = arvados.CollectionWriter() cw.start_new_file('thing1.txt') @@ -149,7 +136,8 @@ class FuseMagicTest(MountTestBase): self.testcollection = cw.finish() self.test_manifest = cw.manifest_text() - self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() + coll = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() + self.test_manifest_pdh = coll['portable_data_hash'] def runTest(self): self.make_mount(fuse.MagicDirectory) @@ -159,21 +147,32 @@ class FuseMagicTest(MountTestBase): self.assertFalse(any(arvados.util.keep_locator_pattern.match(fn) or arvados.util.uuid_pattern.match(fn) for fn in mount_ls), - "new FUSE MagicDirectory lists Collection") + "new FUSE MagicDirectory has no collections or projects") self.assertDirContents(self.testcollection, ['thing1.txt']) self.assertDirContents(os.path.join('by_id', self.testcollection), ['thing1.txt']) + self.assertIn(self.collection_in_test_project, + llfuse.listdir(os.path.join(self.mounttmp, self.test_project))) + self.assertIn(self.collection_in_test_project, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.test_project))) + mount_ls = llfuse.listdir(self.mounttmp) self.assertIn('README', mount_ls) self.assertIn(self.testcollection, mount_ls) self.assertIn(self.testcollection, llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) + self.assertIn(self.test_project, mount_ls) + self.assertIn(self.test_project, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) + + with self.assertRaises(OSError): + llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.non_project_group)) files = {} - files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1' + files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1' - for k, v in files.items(): - with open(os.path.join(self.mounttmp, k)) as f: + for k, v in viewitems(files): + with open(os.path.join(self.mounttmp, k), 'rb') as f: self.assertEqual(v, f.read()) @@ -223,66 +222,62 @@ class FuseTagsUpdateTest(MountTestBase): attempt(self.assertDirContents, 'fuse_test_tag', [bar_uuid]) +def fuseSharedTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + # Double check that we can open and read objects in this folder as a file, + # and that its contents are what we expect. + baz_path = os.path.join( + mounttmp, + 'FUSE User', + 'FUSE Test Project', + 'collection in FUSE project', + 'baz') + with open(baz_path) as f: + self.assertEqual("baz", f.read()) + + # check mtime on collection + st = os.stat(baz_path) + try: + mtime = st.st_mtime_ns // 1000000000 + except AttributeError: + mtime = st.st_mtime + self.assertEqual(mtime, 1391448174) + + # shared_dirs is a list of the directories exposed + # by fuse.SharedDirectory (i.e. any object visible + # to the current user) + shared_dirs = llfuse.listdir(mounttmp) + shared_dirs.sort() + self.assertIn('FUSE User', shared_dirs) + + # fuse_user_objs is a list of the objects owned by the FUSE + # test user (which present as files in the 'FUSE User' + # directory) + fuse_user_objs = llfuse.listdir(os.path.join(mounttmp, 'FUSE User')) + fuse_user_objs.sort() + self.assertEqual(['FUSE Test Project', # project owned by user + 'collection #1 owned by FUSE', # collection owned by user + 'collection #2 owned by FUSE' # collection owned by user + ], fuse_user_objs) + + # test_proj_files is a list of the files in the FUSE Test Project. + test_proj_files = llfuse.listdir(os.path.join(mounttmp, 'FUSE User', 'FUSE Test Project')) + test_proj_files.sort() + self.assertEqual(['collection in FUSE project' + ], test_proj_files) + + + Test().runTest() + class FuseSharedTest(MountTestBase): def runTest(self): self.make_mount(fuse.SharedDirectory, exclude=self.api.users().current().execute()['uuid']) + keep = arvados.keep.KeepClient() + keep.put("baz") - # shared_dirs is a list of the directories exposed - # by fuse.SharedDirectory (i.e. any object visible - # to the current user) - shared_dirs = llfuse.listdir(self.mounttmp) - shared_dirs.sort() - self.assertIn('FUSE User', shared_dirs) - - # fuse_user_objs is a list of the objects owned by the FUSE - # test user (which present as files in the 'FUSE User' - # directory) - fuse_user_objs = llfuse.listdir(os.path.join(self.mounttmp, 'FUSE User')) - fuse_user_objs.sort() - self.assertEqual(['FUSE Test Project', # project owned by user - 'collection #1 owned by FUSE', # collection owned by user - 'collection #2 owned by FUSE', # collection owned by user - 'pipeline instance owned by FUSE.pipelineInstance', # pipeline instance owned by user - ], fuse_user_objs) - - # test_proj_files is a list of the files in the FUSE Test Project. - test_proj_files = llfuse.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project')) - test_proj_files.sort() - self.assertEqual(['collection in FUSE project', - 'pipeline instance in FUSE project.pipelineInstance', - 'pipeline template in FUSE project.pipelineTemplate' - ], test_proj_files) - - # Double check that we can open and read objects in this folder as a file, - # and that its contents are what we expect. - pipeline_template_path = os.path.join( - self.mounttmp, - 'FUSE User', - 'FUSE Test Project', - 'pipeline template in FUSE project.pipelineTemplate') - with open(pipeline_template_path) as f: - j = json.load(f) - self.assertEqual("pipeline template in FUSE project", j['name']) - - # check mtime on template - st = os.stat(pipeline_template_path) - try: - mtime = st.st_mtime_ns / 1000000000 - except AttributeError: - mtime = st.st_mtime - self.assertEqual(mtime, 1397493304) - - # check mtime on collection - st = os.stat(os.path.join( - self.mounttmp, - 'FUSE User', - 'collection #1 owned by FUSE')) - try: - mtime = st.st_mtime_ns / 1000000000 - except AttributeError: - mtime = st.st_mtime - self.assertEqual(mtime, 1391448174) + self.pool.apply(fuseSharedTestHelper, (self.mounttmp,)) class FuseHomeTest(MountTestBase): @@ -298,7 +293,7 @@ class FuseHomeTest(MountTestBase): 'anonymously_accessible_project'] found_in = 0 found_not_in = 0 - for name, item in run_test_server.fixture('collections').iteritems(): + for name, item in viewitems(run_test_server.fixture('collections')): if 'name' not in item: pass elif item['owner_uuid'] == public_project['uuid']: @@ -624,9 +619,10 @@ class FuseRmTest(MountTestBase): r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') self.pool.apply(fuseRmTestHelperDeleteFile, (self.mounttmp,)) - # Can't have empty directories :-( so manifest will be empty. + # Empty directories are represented by an empty file named "." collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertEqual(collection2["manifest_text"], "") + self.assertRegexpMatches(collection2["manifest_text"], + r'./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,)) @@ -683,7 +679,7 @@ class FuseMvFileTest(MountTestBase): collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt\n\./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') def fuseRenameTestHelper(mounttmp): @@ -752,6 +748,34 @@ class FuseUpdateFromEventTest(MountTestBase): attempt(self.assertEqual, ["file1.txt"], llfuse.listdir(os.path.join(self.mounttmp))) +class FuseDeleteProjectEventTest(MountTestBase): + def runTest(self): + + aproject = self.api.groups().create(body={ + "name": "aproject", + "group_class": "project" + }).execute() + + bproject = self.api.groups().create(body={ + "name": "bproject", + "group_class": "project", + "owner_uuid": aproject["uuid"] + }).execute() + + self.make_mount(fuse.ProjectDirectory, + project_object=self.api.users().current().execute()) + + self.operations.listen_for_events() + + d1 = llfuse.listdir(os.path.join(self.mounttmp, "aproject")) + self.assertEqual(["bproject"], sorted(d1)) + + self.api.groups().delete(uuid=bproject["uuid"]).execute() + + for attempt in AssertWithTimeout(10): + attempt(self.assertEqual, [], llfuse.listdir(os.path.join(self.mounttmp, "aproject"))) + + def fuseFileConflictTestHelper(mounttmp): class Test(unittest.TestCase): def runTest(self): @@ -1051,7 +1075,13 @@ class MagicDirApiError(FuseMagicTest): def setUp(self): api = mock.MagicMock() super(MagicDirApiError, self).setUp(api=api) - api.collections().get().execute.side_effect = iter([Exception('API fail'), {"manifest_text": self.test_manifest}]) + api.collections().get().execute.side_effect = iter([ + Exception('API fail'), + { + "manifest_text": self.test_manifest, + "portable_data_hash": self.test_manifest_pdh, + }, + ]) api.keep.get.side_effect = Exception('Keep fail') def runTest(self): @@ -1136,10 +1166,10 @@ class FuseMagicTestPDHOnly(MountTestBase): llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) files = {} - files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1' + files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1' - for k, v in files.items(): - with open(os.path.join(self.mounttmp, k)) as f: + for k, v in viewitems(files): + with open(os.path.join(self.mounttmp, k), 'rb') as f: self.assertEqual(v, f.read()) # look up using uuid should fail when pdh_only is set