From 7a2fb3694d74ff9ab64d1cbaa113a5428a92269f Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 1 Jun 2015 16:10:40 +0200 Subject: tests: use single-brick volume for mount-nfs-auth.t When running with the replica-3 volume, the "big_write" test sometimes becomes unresponsive. This seems to be an issue (bug 1226941) in the RPC/socket-layer, and not related to the NFS test itself. BUG: 1163543 Change-Id: I51115e4b68d45f3ef7902b4f7a8535518d09408f Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/11085 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- tests/basic/mount-nfs-auth.t | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t index fcb41e8e35b..06b1e4e0493 100755 --- a/tests/basic/mount-nfs-auth.t +++ b/tests/basic/mount-nfs-auth.t @@ -64,7 +64,7 @@ function netgroup_deny_this_host () { } function create_vol () { - TEST $CLI vol create $V0 replica 3 $H0:$B0/b0 $H0:$B0/b1 $H0:$B0/b2 + $CLI vol create $V0 $H0:$B0/b0 } function setup_cluster() { @@ -143,9 +143,7 @@ function restart_nfs () { setup_cluster # run preliminary tests -TEST $CLI vol set $V0 cluster.self-heal-daemon off TEST $CLI vol set $V0 nfs.disable off -TEST $CLI vol set $V0 cluster.choose-local off TEST $CLI vol start $V0 # Get NFS state directory @@ -209,7 +207,10 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 TEST export_deny_this_host TEST netgroup_allow_this_host -EXPECT_WITHIN $AUTH_REFRESH_INTERVAL "Y" check_mount_success $V0 +# wait for the mount authentication to rebuild +sleep $[$AUTH_REFRESH_INTERVAL + 1] + +EXPECT "Y" check_mount_success $V0 EXPECT "Y" small_write TEST big_write EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 -- cgit