diff options
author | Atin Mukherjee <amukherj@redhat.com> | 2015-06-03 10:40:36 +0530 |
---|---|---|
committer | Vijay Bellur <vbellur@redhat.com> | 2015-06-17 15:31:28 -0700 |
commit | 7255e567959ca6f0c211afff00e97a911b471b05 (patch) | |
tree | f1a55b20ae864fc780ab3add03e82435fe596db7 /tests/bugs/glusterd/bug-857330/normal.t | |
parent | 8a7dfb0d4b856578e89898c2bb84a0a675ade50b (diff) |
tests: fix spurious failure in bug-857330/xml.t
Backport of http://review.gluster.org/11054
get-task-status () used to always return 0 *until and unless* the CLI command
itself fails which is unlikely. However if the CLI command fails due to some
reason EXPECT_WITHIN will abort.
Change-Id: Ibe54dcdccc26b3ee003677fc3516cfed98b5c06f
BUG: 1232602
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/11054
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/11266
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/bugs/glusterd/bug-857330/normal.t')
-rwxr-xr-x | tests/bugs/glusterd/bug-857330/normal.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/bugs/glusterd/bug-857330/normal.t b/tests/bugs/glusterd/bug-857330/normal.t index 6377b59070d..c575038b840 100755 --- a/tests/bugs/glusterd/bug-857330/normal.t +++ b/tests/bugs/glusterd/bug-857330/normal.t @@ -34,7 +34,7 @@ EXPECT $TASK_ID get-task-id COMMAND="volume rebalance $V0 status" PATTERN="completed" -EXPECT_WITHIN 300 $PATTERN get-task-status +EXPECT_WITHIN $REBALANCE_TIMEOUT "0" get-task-status $PATTERN ################### ## Replace-brick ## @@ -56,7 +56,7 @@ EXPECT $TASK_ID get-task-id COMMAND="volume remove-brick $V0 $H0:$B0/${V0}3 status" PATTERN="completed" -EXPECT_WITHIN 300 $PATTERN get-task-status +EXPECT_WITHIN $REBALANCE_TIMEOUT "0" get-task-status $PATTERN TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}3 commit |