summaryrefslogtreecommitdiffstats
path: root/tests/basic/ec/ec.t
diff options
context:
space:
mode:
authorRaghavendra Talur <rtalur@redhat.com>2016-03-10 18:01:33 +0530
committerRaghavendra Talur <rtalur@redhat.com>2016-05-04 11:47:11 -0700
commitf02e03374f43ee541a711ff79fd5a4815e55eea5 (patch)
tree820a9c2cf86fa33fbd13567d548c394cf40c3ada /tests/basic/ec/ec.t
parentef77131b44309404d7b1f492c8a92bc3dbf3e6b0 (diff)
tests: Backport all changes to tests dir
Test framework should be the same on all the branches. This is a copy of all the files under tests dir from master branch. New tests in master have not been backported, but changes to existing tests have been. Change-Id: I75747c525aabbd9247473dd29b3a0e7a7d93c827 BUG: 1316533 Signed-off-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-on: http://review.gluster.org/13683 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/basic/ec/ec.t')
-rw-r--r--tests/basic/ec/ec.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index 773d8af3084..b07006545b9 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -221,7 +221,7 @@ TEST setup_perm_file $M0
sleep 2
# Unmount/remount so that create/write and truncate don't see cached data.
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
TEST $GFS -s $H0 --volfile-id $V0 $M1
EXPECT_WITHIN $CHILD_UP_TIMEOUT "8" ec_child_up_count $V0 0
@@ -235,7 +235,7 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field $V0 'Status'
EXPECT_WITHIN $CHILD_UP_TIMEOUT "10" ec_child_up_count $V0 0
# Unmount/remount again, same reason as before.
-TEST umount $M1
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1
TEST $GFS -s $H0 --volfile-id $V0 $M0
EXPECT_WITHIN $CHILD_UP_TIMEOUT "10" ec_child_up_count $V0 0