diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2016-08-30 02:02:45 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-08-31 11:01:39 -0700 |
| commit | 63d24908e01b24cc21bea584fed4b719fca865f3 (patch) | |
| tree | d133d03da9cd22f7cf511f2b5d24410b7bc7bafc | |
| parent | d354ea0a05a3b6a13d227b567a81afdb8ea46abb (diff) | |
tests: Fix spurious failures because of wrong shd up function
Fixed the way shd up check is done to prevent self-heal daemon
not running error when heal full command is executed.
Change-Id: I93c4a0da12316373d62cd4ea74432cd9bf2b090c
BUG: 1370053
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/15341
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Anuradha Talur <atalur@redhat.com>
| -rw-r--r-- | tests/basic/ec/ec-root-heal.t | 2 | ||||
| -rw-r--r-- | tests/bugs/ec/bug-1236065.t | 4 | ||||
| -rw-r--r-- | tests/bugs/ec/bug-1251446.t | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/basic/ec/ec-root-heal.t b/tests/basic/ec/ec-root-heal.t index 91e668c4702..a133885ef1d 100644 --- a/tests/basic/ec/ec-root-heal.t +++ b/tests/basic/ec/ec-root-heal.t @@ -16,7 +16,7 @@ TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $ EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0 touch $M0/{1..10} TEST $CLI volume replace-brick $V0 $H0:$B0/${V0}5 $H0:$B0/${V0}6 commit force -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count_shd $V0 0 # active heal diff --git a/tests/bugs/ec/bug-1236065.t b/tests/bugs/ec/bug-1236065.t index 9038cb95948..35e4e3d1cca 100644 --- a/tests/bugs/ec/bug-1236065.t +++ b/tests/bugs/ec/bug-1236065.t @@ -51,7 +51,7 @@ TEST $CLI volume start $V0 force EXPECT '7' online_brick_count # active heal -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status TEST $CLI volume heal $V0 full EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 @@ -73,7 +73,7 @@ TEST $CLI volume start $V0 force EXPECT '7' online_brick_count # self-healing -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status TEST $CLI volume heal $V0 full EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 diff --git a/tests/bugs/ec/bug-1251446.t b/tests/bugs/ec/bug-1251446.t index f89e71ace8b..5779c2e973b 100644 --- a/tests/bugs/ec/bug-1251446.t +++ b/tests/bugs/ec/bug-1251446.t @@ -24,7 +24,7 @@ EXPECT "$cs" echo $(sha1sum $M0/test2 | awk '{ print $1 }') TEST $CLI volume start $V0 force EXPECT '4' online_brick_count -EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status TEST $CLI volume heal $V0 full EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 |