summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2015-06-03 10:40:36 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-06-16 03:01:03 -0700
commitf65490c5d87c4282717b7f28cfcd1fe9380c6154 (patch)
tree4e1bd0c3b00d39ccbfba8785e90133120eb42b79
parent8e81dccfce17db2d388de95b0b009478cc7d0d4d (diff)
tests: fix spurious failure in bug-857330/xml.t
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: 1227590 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>
-rw-r--r--tests/bugs/cli/bug-1077682.t10
-rw-r--r--tests/bugs/glusterd/bug-857330/common.rc10
-rwxr-xr-xtests/bugs/glusterd/bug-857330/normal.t4
-rwxr-xr-xtests/bugs/glusterd/bug-857330/xml.t4
4 files changed, 10 insertions, 18 deletions
diff --git a/tests/bugs/cli/bug-1077682.t b/tests/bugs/cli/bug-1077682.t
index 6b6d71e..eab5d86 100644
--- a/tests/bugs/cli/bug-1077682.t
+++ b/tests/bugs/cli/bug-1077682.t
@@ -3,16 +3,6 @@
. $(dirname $0)/../../include.rc
. $(dirname $0)/../../volume.rc
-function get-task-status()
-{
- $CLI $COMMAND | grep -o $PATTERN
- if [ ${PIPESTATUS[0]} -ne 0 ];
- then
- return 1
- fi
- return 0
-}
-
cleanup;
TEST glusterd
diff --git a/tests/bugs/glusterd/bug-857330/common.rc b/tests/bugs/glusterd/bug-857330/common.rc
index 8342dcc..d0aa4b1 100644
--- a/tests/bugs/glusterd/bug-857330/common.rc
+++ b/tests/bugs/glusterd/bug-857330/common.rc
@@ -47,9 +47,11 @@ function get-task-id-xml()
function get-task-status()
{
- $CLI $COMMAND | grep -o $PATTERN
- if [ ${PIPESTATUS[0]} -ne 0 ]; then
- return 1
+ pattern=$1
+ val=1
+ test=$(gluster $COMMAND | grep -o $pattern 2>&1)
+ if [ $? -eq 0 ]; then
+ val=0
fi
- return 0
+ echo $val
}
diff --git a/tests/bugs/glusterd/bug-857330/normal.t b/tests/bugs/glusterd/bug-857330/normal.t
index 6377b59..c575038 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
diff --git a/tests/bugs/glusterd/bug-857330/xml.t b/tests/bugs/glusterd/bug-857330/xml.t
index 7d04fe1..c25a8a6 100755
--- a/tests/bugs/glusterd/bug-857330/xml.t
+++ b/tests/bugs/glusterd/bug-857330/xml.t
@@ -42,7 +42,7 @@ EXPECT $TASK_ID get-task-id-xml
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 ##
@@ -66,7 +66,7 @@ EXPECT $TASK_ID get-task-id-xml
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
## TODO: Add tests for remove-brick stop