summaryrefslogtreecommitdiffstats
path: root/tests/bugs/bug-983477.t
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-06-19 13:51:41 +0530
committerVijay Bellur <vbellur@redhat.com>2014-06-23 03:13:28 -0700
commit8d92734f289ab55910045ba7b92bbef1d0dd123c (patch)
tree3db8b723f2068006a17d33676b230a65944a5a6e /tests/bugs/bug-983477.t
parent1e4a046828ea11cb4c7738a2a00fb715f84dc1ff (diff)
tests: Change umount with force_umount with 5 retries
Change-Id: I0e2dbdfd34080328dfa6b4eebef0366f2b0fcb04 BUG: 1092850 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/8117 Tested-by: Justin Clift <justin@gluster.org> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-by: Sachin Pandit <spandit@redhat.com> Reviewed-by: Prashanth Pai <ppai@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/bugs/bug-983477.t')
-rwxr-xr-xtests/bugs/bug-983477.t8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/bugs/bug-983477.t b/tests/bugs/bug-983477.t
index b9d3002be30..47d2f30833a 100755
--- a/tests/bugs/bug-983477.t
+++ b/tests/bugs/bug-983477.t
@@ -24,28 +24,28 @@ TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0
TEST cd $M0
EXPECT "1" get_use_readdirp_value $V0
TEST cd -
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
#If readdirp is enabled statedump should reflect it
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp=no
TEST cd $M0
EXPECT "0" get_use_readdirp_value $V0
TEST cd -
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
#Since args are optional on this argument just specifying "--use-readdirp" should also turn it `on` not `off`
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp
TEST cd $M0
EXPECT "1" get_use_readdirp_value $V0
TEST cd -
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
#By default it is enabled.
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
TEST cd $M0
EXPECT "1" get_use_readdirp_value $V0
TEST cd -
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
#Invalid values for use-readdirp should not be accepted
TEST ! glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 --use-readdirp=please-fail