From 5a9233ee37a10456a9f8f3c792cab37462f64098 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Thu, 25 Feb 2016 20:36:11 +0530 Subject: tests/glusterd: Parse the new time format A recent change in cli changed elapsed time format that broke a test. This patch will fix the issue with parsing. Change-Id: I9a4a4b28f654cf2ac223e25abfc9df6570607d74 BUG: 1312036 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/13524 Reviewed-by: Kaleb KEITHLEY CentOS-regression: Gluster Build System Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Ravishankar N Reviewed-by: Raghavendra Talur --- tests/basic/tier/tierd_check.t | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/tier/tierd_check.t b/tests/basic/tier/tierd_check.t index ee97883688d..6edd2f3b795 100644 --- a/tests/basic/tier/tierd_check.t +++ b/tests/basic/tier/tierd_check.t @@ -19,11 +19,6 @@ function create_dist_tier_vol () { TEST $CLI volume set $V0 cluster.tier-mode test } -function tier_deamon_check () { -pgrep -f "rebalance/$V0" -echo "$?" -} - function tier_deamon_kill () { pkill -f "rebalance/$V0" echo "$?" @@ -40,22 +35,22 @@ TEST $CLI volume status #Create and start a tiered volume create_dist_tier_vol -EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 tier_deamon_check +EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 tier_daemon_check EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 tier_deamon_kill TEST $CLI volume tier $V0 start -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_deamon_check +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_daemon_check EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_deamon_kill TEST $CLI volume tier $V0 start force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_deamon_check +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_daemon_check TEST $CLI volume tier $V0 start force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_deamon_check +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" tier_daemon_check cleanup -- cgit