diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2014-06-19 13:51:41 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-06-23 03:13:28 -0700 |
| commit | 8d92734f289ab55910045ba7b92bbef1d0dd123c (patch) | |
| tree | 3db8b723f2068006a17d33676b230a65944a5a6e /tests/basic/afr | |
| parent | 1e4a046828ea11cb4c7738a2a00fb715f84dc1ff (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/basic/afr')
| -rw-r--r-- | tests/basic/afr/gfid-mismatch.t | 3 | ||||
| -rw-r--r-- | tests/basic/afr/read-subvol-data.t | 2 | ||||
| -rw-r--r-- | tests/basic/afr/read-subvol-entry.t | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/basic/afr/gfid-mismatch.t b/tests/basic/afr/gfid-mismatch.t index 05f48d43a2c..29951354a04 100644 --- a/tests/basic/afr/gfid-mismatch.t +++ b/tests/basic/afr/gfid-mismatch.t @@ -2,6 +2,7 @@ #Test that GFID mismatches result in EIO . $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc cleanup; #Init @@ -20,7 +21,7 @@ TEST setfattr -n trusted.gfid -v 0sBfz5vAdHTEK1GZ99qjqTIg== $B0/brick0/file TEST ! "find $M0/file | xargs stat" #Cleanup -TEST umount $M0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $CLI volume stop $V0 TEST $CLI volume delete $V0 TEST rm -rf $B0/* diff --git a/tests/basic/afr/read-subvol-data.t b/tests/basic/afr/read-subvol-data.t index 25ae3e63c64..2fa20a2c181 100644 --- a/tests/basic/afr/read-subvol-data.t +++ b/tests/basic/afr/read-subvol-data.t @@ -27,7 +27,7 @@ TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT "10485760" echo `ls -l $M0/afr_success_5.txt | awk '{ print $5}'` #Cleanup -TEST umount $M0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $CLI volume stop $V0 TEST $CLI volume delete $V0 TEST rm -rf $B0/* diff --git a/tests/basic/afr/read-subvol-entry.t b/tests/basic/afr/read-subvol-entry.t index 3e7ee3f35dd..f64276fabd4 100644 --- a/tests/basic/afr/read-subvol-entry.t +++ b/tests/basic/afr/read-subvol-entry.t @@ -29,7 +29,7 @@ TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT "ghi" echo `ls $M0/abc/def/` #Cleanup -TEST umount $M0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $CLI volume stop $V0 TEST $CLI volume delete $V0 TEST rm -rf $B0/* |