summaryrefslogtreecommitdiffstats
path: root/tests/bugs/geo-replication
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/bugs/geo-replication
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/bugs/geo-replication')
-rw-r--r--tests/bugs/geo-replication/bug-1111490.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bugs/geo-replication/bug-1111490.t b/tests/bugs/geo-replication/bug-1111490.t
index d29cba1a396..9686fb5a0ef 100644
--- a/tests/bugs/geo-replication/bug-1111490.t
+++ b/tests/bugs/geo-replication/bug-1111490.t
@@ -25,7 +25,7 @@ EXPECT "$uuid" getfattr --only-values -n glusterfs.gfid.string $M0/file0
# unmount and mount again so as to start with a fresh inode table
# or use another mount...
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
# touch the file again (gfid-access.py handles errno)