X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c4ae463b42ee22180982d78289e6898224e508e4..386e1eefaac2021805f73732b10e9f543c221593:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 1d7b9087ab..ec8868af7d 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -1,27 +1,52 @@ -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 + 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 arvados +import arvados_fuse as fuse import run_test_server -import mock from mount_test_base import MountTestBase logger = logging.getLogger('arvados.arv-mount') +class AssertWithTimeout(object): + """Allow some time for an assertion to pass.""" + + def __init__(self, timeout=0): + self.timeout = timeout + + def __iter__(self): + self.deadline = time.time() + self.timeout + self.done = False + return self + + def next(self): + if self.done: + raise StopIteration + return self.attempt + + def attempt(self, fn, *args, **kwargs): + try: + fn(*args, **kwargs) + except AssertionError: + if time.time() > self.deadline: + raise + time.sleep(0.1) + else: + self.done = True + + class FuseMountTest(MountTestBase): def setUp(self): super(FuseMountTest, self).setUp() @@ -181,72 +206,76 @@ class FuseTagsUpdateTest(MountTestBase): bar_uuid = run_test_server.fixture('collections')['bar_file']['uuid'] self.tag_collection(bar_uuid, 'fuse_test_tag') - time.sleep(1) - self.assertIn('fuse_test_tag', llfuse.listdir(self.mounttmp)) + for attempt in AssertWithTimeout(10): + attempt(self.assertIn, 'fuse_test_tag', llfuse.listdir(self.mounttmp)) self.assertDirContents('fuse_test_tag', [bar_uuid]) baz_uuid = run_test_server.fixture('collections')['baz_file']['uuid'] l = self.tag_collection(baz_uuid, 'fuse_test_tag') - time.sleep(1) - self.assertDirContents('fuse_test_tag', [bar_uuid, baz_uuid]) + for attempt in AssertWithTimeout(10): + attempt(self.assertDirContents, 'fuse_test_tag', [bar_uuid, baz_uuid]) self.api.links().delete(uuid=l['uuid']).execute() - time.sleep(1) - self.assertDirContents('fuse_test_tag', [bar_uuid]) + for attempt in AssertWithTimeout(10): + 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) - self.assertEqual(st.st_mtime, 1397493304) - - # check mtime on collection - st = os.stat(os.path.join( - self.mounttmp, - 'FUSE User', - 'collection #1 owned by FUSE')) - self.assertEqual(st.st_mtime, 1391448174) + self.pool.apply(fuseSharedTestHelper, (self.mounttmp,)) class FuseHomeTest(MountTestBase): @@ -703,7 +732,7 @@ class FuseUpdateFromEventTest(MountTestBase): with llfuse.lock: m.new_collection(collection.api_response(), collection) - self.operations.listen_for_events(self.api) + self.operations.listen_for_events() d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual([], sorted(d1)) @@ -712,12 +741,8 @@ class FuseUpdateFromEventTest(MountTestBase): with collection2.open("file1.txt", "w") as f: f.write("foo") - time.sleep(1) - - # should show up via event bus notify - - d1 = llfuse.listdir(os.path.join(self.mounttmp)) - self.assertEqual(["file1.txt"], sorted(d1)) + for attempt in AssertWithTimeout(10): + attempt(self.assertEqual, ["file1.txt"], llfuse.listdir(os.path.join(self.mounttmp))) def fuseFileConflictTestHelper(mounttmp):