summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Pandit <spandit@redhat.com>2014-06-25 03:57:42 +0530
committerVijay Bellur <vbellur@redhat.com>2014-07-02 02:56:32 -0700
commit0e6cd39d55be3f4397772dcd75b0b59daedc8f55 (patch)
tree5c1388bf84bd07aba99eb26b18726b1083ef31cc
parentcaa8a4ea50734378e7e19f70b39a837c58e9d229 (diff)
TESTS : replace "umount" with "force_umount" giving 5 retries.
Change-Id: I89dd87b9843273c57843bb28706f284e32debc48 BUG: 1092850 Signed-off-by: Sachin Pandit <spandit@redhat.com> Reviewed-on: http://review.gluster.org/8167 Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Prashanth Pai <ppai@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-xtests/encryption/crypt.t4
-rwxr-xr-xtests/features/glupy.t3
-rwxr-xr-xtests/features/readdir-ahead.t3
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/encryption/crypt.t b/tests/encryption/crypt.t
index aa46bd42985..ecfe005202d 100755
--- a/tests/encryption/crypt.t
+++ b/tests/encryption/crypt.t
@@ -55,7 +55,7 @@ TEST ln -s $M0/testfile-link $M0/testfile-symlink
TEST rm -f $M0/testfile-renamed
## Remount the volume
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
TEST diff -u $M0/testfile-symlink /tmp/$V0-goodfile
@@ -69,7 +69,7 @@ TEST rm -f $M0/testfile-link
TEST rm -f /tmp/$V0-master-key
TEST rm -f /tmp/$V0-goodfile
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
## Reset crypt options
TEST $CLI volume reset $V0 encryption.block-size
diff --git a/tests/features/glupy.t b/tests/features/glupy.t
index 49bf11df516..a34e48ffec0 100755
--- a/tests/features/glupy.t
+++ b/tests/features/glupy.t
@@ -1,6 +1,7 @@
#!/bin/bash
. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
cleanup;
@@ -24,6 +25,6 @@ TEST touch $M0/filename;
EXPECT "filename" ls $M0
TEST rm -f $M0/filename;
-TEST umount -l $M0;
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0;
cleanup;
diff --git a/tests/features/readdir-ahead.t b/tests/features/readdir-ahead.t
index c7ee637f0b2..2b2a2fb5644 100755
--- a/tests/features/readdir-ahead.t
+++ b/tests/features/readdir-ahead.t
@@ -6,6 +6,7 @@
###
. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
cleanup;
@@ -37,7 +38,7 @@ TEST [ $count -eq 0 ]
TEST rmdir $M0/test
-TEST umount -l $M0;
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0;
TEST $CLI volume stop $V0
TEST $CLI volume delete $V0