diff options
| -rwxr-xr-x | run-tests.sh | 1 | ||||
| -rwxr-xr-x | tests/basic/mount-nfs-auth.t | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/run-tests.sh b/run-tests.sh index 8f404876302..ee7405e5e67 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -195,7 +195,6 @@ function is_bad_test () { local name=$1 for bt in ./tests/basic/quota-anon-fd-nfs.t \ - ./tests/basic/mount-nfs-auth.t\ ; do [ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success done 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 |