projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11158: Fixes & test updates for ProjectDirectory.
[arvados.git]
/
services
/
fuse
/
tests
/
integration_test.py
diff --git
a/services/fuse/tests/integration_test.py
b/services/fuse/tests/integration_test.py
index 6a0c5de8992b856f4692376acb38d634f2250791..ba9cd88eb7d607c6f50beed6b1cecad17c4fabe9 100644
(file)
--- a/
services/fuse/tests/integration_test.py
+++ b/
services/fuse/tests/integration_test.py
@@
-8,6
+8,7
@@
import arvados_fuse.command
import atexit
import functools
import inspect
import atexit
import functools
import inspect
+import llfuse
import logging
import multiprocessing
import os
import logging
import multiprocessing
import os
@@
-76,6
+77,10
@@
class IntegrationTest(unittest.TestCase):
def decorator(func):
@functools.wraps(func)
def wrapper(self, *args, **kwargs):
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(
self.mount = None
try:
with arvados_fuse.command.Mount(