X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/503c686bc80825d00980a970af69ec60f9e6ce9b..bffd1e4ee8532992b3790e4f232804a6731a9685:/services/fuse/tests/integration_test.py diff --git a/services/fuse/tests/integration_test.py b/services/fuse/tests/integration_test.py index b485037c8c..ba9cd88eb7 100644 --- a/services/fuse/tests/integration_test.py +++ b/services/fuse/tests/integration_test.py @@ -1,9 +1,14 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + import arvados import arvados_fuse import arvados_fuse.command import atexit import functools import inspect +import llfuse import logging import multiprocessing import os @@ -61,7 +66,6 @@ class IntegrationTest(unittest.TestCase): def setUp(self): self.mnt = tempfile.mkdtemp() run_test_server.authorize_with('active') - self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) def tearDown(self): os.rmdir(self.mnt) @@ -73,6 +77,10 @@ class IntegrationTest(unittest.TestCase): def decorator(func): @functools.wraps(func) def wrapper(self, *args, **kwargs): + # Workaround for llfuse deadlock bug. See #10805, #8345, + # https://bitbucket.org/nikratio/python-llfuse/issues/108 + llfuse.close = lambda *args: None + self.mount = None try: with arvados_fuse.command.Mount(