From 5b96d4d6b8e1041eed0193921e1cb6e3fa562af8 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Mon, 11 May 2015 09:20:13 -0700 Subject: [PATCH] sharness: `fusermount -u` is the documented way to unmount FUSE on Linux License: MIT Signed-off-by: Jeromy --- test/sharness/lib/test-lib.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/sharness/lib/test-lib.sh b/test/sharness/lib/test-lib.sh index db1d4031a..540380221 100644 --- a/test/sharness/lib/test-lib.sh +++ b/test/sharness/lib/test-lib.sh @@ -215,12 +215,20 @@ test_launch_ipfs_daemon() { fi } +do_umount() { + if [ "$(uname -s)" = "Linux" ]; then + fusermount -u "$1" + else + umount "$1" + fi +} + test_mount_ipfs() { # make sure stuff is unmounted first. test_expect_success FUSE "'ipfs mount' succeeds" ' - umount "$(pwd)/ipfs" || true && - umount "$(pwd)/ipns" || true && + do_umount "$(pwd)/ipfs" || true && + do_umount "$(pwd)/ipns" || true && ipfs mount >actual '