diff options
| -rw-r--r-- | tests/basic/afr/shd-autofix-nogfid.t | 7 | ||||
| -rwxr-xr-x | tests/basic/mount-nfs-auth.t | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/basic/afr/shd-autofix-nogfid.t b/tests/basic/afr/shd-autofix-nogfid.t index 7c9026dce62..8bc2c965640 100644 --- a/tests/basic/afr/shd-autofix-nogfid.t +++ b/tests/basic/afr/shd-autofix-nogfid.t @@ -37,8 +37,13 @@ MD5=$(md5sum $M0/foo/testfile | cut -d\ -f1) mkdir $B0/${V0}1/foo +TEST $CLI volume stop $V0 +# Give GlusterD a moment to get its $#@! together. If we issue these commands +# back to back (or use "start force") then the start doesn't work properly and +# get_pending_heal_count fails. +sleep 5 # Kick off the SHD and wait 30 seconds for healing to take place -TEST gluster vol start $V0 force +TEST $CLI volume start $V0 EXPECT_WITHIN 30 "0" get_pending_heal_count $V0 # Verify the file was healed back to brick 1 diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t index 7f990c9aeb2..00710efd03f 100755 --- a/tests/basic/mount-nfs-auth.t +++ b/tests/basic/mount-nfs-auth.t @@ -269,6 +269,9 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 TEST export_allow_this_host_l1 TEST netgroup_allow_this_host +# Give the auth stuff a moment to catch up. +sleep 5 + EXPECT_WITHIN $MY_MOUNT_TIMEOUT "Y" check_mount_success $V0L1 EXPECT "Y" small_write |