summaryrefslogtreecommitdiffstats
path: root/tests/bitrot
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-11 03:32:20 +0200
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-05-18 09:34:49 -0700
commitb7a72375353d583928d971b64eb9f0674904ba76 (patch)
treee6f9ba3369c042fc17f6a600ccc2ac8ec6544872 /tests/bitrot
parentcfca748fef28170377b868871b0dd980c1f151f6 (diff)
Tests: avoid hang in br-stub.t
br-stub.t forgot to unmount the NFS mount, leading to the situation where cleanup code had to do it after glusterfs daemon were shut down. NetBSD has trouble dealing with this situation and may enter endless wait for the NFS server to come back. Fix is simply to unmount before the end og the script BUG: 1129939 Change-Id: I972d379172a75f29ad11abc66d700c2d31106194 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10748 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'tests/bitrot')
-rw-r--r--tests/bitrot/br-stub.t2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/bitrot/br-stub.t b/tests/bitrot/br-stub.t
index bab4c7c..eb0c55c 100644
--- a/tests/bitrot/br-stub.t
+++ b/tests/bitrot/br-stub.t
@@ -49,6 +49,8 @@ touch $fname; # backpath remains same..
TEST $STUB_EXEC $fname $(dirname $backpath)
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
+
##cleanups..
rm -f $STUB_EXEC