diff options
Diffstat (limited to 'test/util.py')
-rw-r--r-- | test/util.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/util.py b/test/util.py index f2a485c..34f1049 100644 --- a/test/util.py +++ b/test/util.py @@ -20,10 +20,16 @@ def wait_for_mount(mount_process, mnt_dir, elapsed += 0.1 pytest.fail("mountpoint failed to come up") -def cleanup(mnt_dir): +def cleanup(mount_process, mnt_dir): subprocess.call(['fusermount', '-z', '-u', mnt_dir], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT) + mount_process.terminate() + try: + mount_process.wait(1) + except subprocess.TimeoutExpired: + mount_process.kill() + def umount(mount_process, mnt_dir): subprocess.check_call(['fusermount', '-z', '-u', mnt_dir ]) |