summaryrefslogtreecommitdiffstats
path: root/tests/bitrot
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-05-11 03:35:06 +0200
committerVijay Bellur <vbellur@redhat.com>2015-05-22 21:30:33 -0700
commit83777286f6ca1213509080ea8bcc43e8cd91db65 (patch)
tree587aa213f9288f73cc1aa12c50f64dafc262b68c /tests/bitrot
parent71ef7a27f1d40104b1c25ca3a0ba104c29ef1df4 (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 Backport of I972d379172a75f29ad11abc66d700c2d31106194 BUG: 1212676 Change-Id: I81b3823e71aca8d8e976da63d226c0be0d462b69 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/10749 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Vijay Bellur <vbellur@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 bab4c7cdbd1..eb0c55caa36 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