From 7382b7a2d35e93944ff364d36017f51e9a1cd392 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 8 Sep 2016 14:26:58 -0400 Subject: [PATCH] 9986: Kill test suite when danger of deadlock is detected. --- services/fuse/tests/integration_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/fuse/tests/integration_test.py b/services/fuse/tests/integration_test.py index d0e3102b67..c70593488e 100644 --- a/services/fuse/tests/integration_test.py +++ b/services/fuse/tests/integration_test.py @@ -76,7 +76,12 @@ class IntegrationTest(unittest.TestCase): arvados_fuse.command.ArgumentParser().parse_args( argv + ['--foreground', '--unmount-timeout=0.1', - self.mnt])): + self.mnt])) as m: return func(self, *args, **kwargs) + if m.llfuse_thread.is_alive(): + self.logger.warning("IntegrationTest.mount:" + " llfuse thread still alive after umount" + " -- killing test suite to avoid deadlock") + os.kill(os.getpid(), signal.SIGKILL) return wrapper return decorator -- 2.30.2