12134: Revert "10805: Skip llfuse.close() to avoid llfuse deadlocks in test suite."

This reverts commit 07cd679b6526fcc9f2d3295f10751906e91872c9.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/services/fuse/tests/integration_test.py b/services/fuse/tests/integration_test.py
index ba9cd88eb7d607c6f50beed6b1cecad17c4fabe9..6a0c5de8992b856f4692376acb38d634f2250791 100644 (file)
--- a/services/fuse/tests/integration_test.py
+++ b/services/fuse/tests/integration_test.py
@@ -8,7 +8,6 @@ import arvados_fuse.command
 import atexit
 import functools
 import inspect
-import llfuse
 import logging
 import multiprocessing
 import os
@@ -77,10 +76,6 @@ 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(

diff --git a/services/fuse/tests/mount_test_base.py b/services/fuse/tests/mount_test_base.py
index 96ff889fcfbdb0de8e2d07ed0ea6a15ebd6f0bfe..8518d8bbead64b34b0ebfcb8308e18bdc6c6c6d7 100644 (file)
--- a/services/fuse/tests/mount_test_base.py
+++ b/services/fuse/tests/mount_test_base.py
@@ -43,10 +43,6 @@ class MountTestBase(unittest.TestCase):
         self.api = api if api else arvados.safeapi.ThreadSafeApiCache(arvados.config.settings())
         self.llfuse_thread = None
 
-        # Workaround for llfuse deadlock bug. See #10805, #8345,
-        # https://bitbucket.org/nikratio/python-llfuse/issues/108
-        llfuse.close = lambda *args: None
-
     # This is a copy of Mount's method.  TODO: Refactor MountTestBase
     # to use a Mount instead of copying its code.
     def _llfuse_main(self):