summaryrefslogtreecommitdiffstats
path: root/tests/basic/tier
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2018-08-08 10:30:31 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2018-08-13 13:43:51 +0000
commit885c56b6f3c43cea0b27345f47f5522b42ebf278 (patch)
tree16d22fc839b7b82da1caeafaa352c264d5a0f5a9 /tests/basic/tier
parent68be932b53daa27be7504bc49ac4c8ba33b5a733 (diff)
downloadglusterfs-885c56b6f3c43cea0b27345f47f5522b42ebf278.tar.gz
glusterfs-885c56b6f3c43cea0b27345f47f5522b42ebf278.tar.xz
glusterfs-885c56b6f3c43cea0b27345f47f5522b42ebf278.zip
tests: fix brick check orders
fix brick checks for validating-server-quorum.t & quorum-validation.t ...and make brick_up_status_1 function more generic. Also fix a timing issue in bug-1482023-snpashot-issue-with-other-processes-accessing-mounted-path.t Change-Id: I797ef4cec5b160aafa979bae7151b1e99fcb48ac Updates: bz#1603063 Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'tests/basic/tier')
-rw-r--r--tests/basic/tier/new-tier-cmds.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/tier/new-tier-cmds.t b/tests/basic/tier/new-tier-cmds.t
index 2c48e027b1..b9c9390536 100644
--- a/tests/basic/tier/new-tier-cmds.t
+++ b/tests/basic/tier/new-tier-cmds.t
@@ -88,8 +88,8 @@ TEST $glusterd_2;
EXPECT_WITHIN $PROBE_TIMEOUT 2 check_peers;
# Make sure we check that the *bricks* are up and not just the node. >:-(
-EXPECT_WITHIN $CHILD_UP_TIMEOUT 1 brick_up_status_1 $V0 $H2 $B2/${V0}_b2
-EXPECT_WITHIN $CHILD_UP_TIMEOUT 1 brick_up_status_1 $V0 $H2 $B2/${V0}_h2
+EXPECT_WITHIN $CHILD_UP_TIMEOUT 1 cluster_brick_up_status 1 $V0 $H2 $B2/${V0}_b2
+EXPECT_WITHIN $CHILD_UP_TIMEOUT 1 cluster_brick_up_status 1 $V0 $H2 $B2/${V0}_h2
# Parsing normal output doesn't work because of line-wrap issues on our
# regression machines, and the version of xmllint there doesn't support --xpath