summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2012-12-18 18:44:54 +0530
committerVijay Bellur <vbellur@redhat.com>2013-01-10 02:08:49 -0800
commit7e6395bd8e1810ba8c4614afe15616378b5f7ef5 (patch)
treea7610f28f9a92769ae67821a039f3370b6e0b9fd
parent292e1b3f7bccd7cbbced62707a1d4f59cef90222 (diff)
tests: make EXPECT_WITHIN also fail on command failure
Change-Id: I051bbe2344f19e647826ee177932ae8b95747ebd BUG: 764966 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/4334 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/bugs/bug-857330/common.rc4
-rw-r--r--tests/include.rc13
2 files changed, 15 insertions, 2 deletions
diff --git a/tests/bugs/bug-857330/common.rc b/tests/bugs/bug-857330/common.rc
index f2327a86217..40da95e8c33 100644
--- a/tests/bugs/bug-857330/common.rc
+++ b/tests/bugs/bug-857330/common.rc
@@ -67,4 +67,8 @@ function check-with-stored-task-id-xml()
function get-task-status()
{
$CLI $COMMAND | grep -o $PATTERN
+ if [ ${PIPESTATUS[0]} -ne 0 ]; then
+ return 1
+ fi
+ return 0
}
diff --git a/tests/include.rc b/tests/include.rc
index f5cab1f6640..90bcb8ec7b8 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -127,8 +127,17 @@ function _EXPECT_WITHIN()
local success=0
while [ `date +%s` -lt $endtime ]; do
- "$@" | tail -1 | egrep -q "^${e}\$"
- if [ $? -eq 0 ]; then
+ ("$@") | tail -1 | egrep -q "^${e}\$"
+
+ local pipestatus=(${PIPESTATUS[@]})
+
+ ## Check command success
+ if [ ${pipestatus[0]} -ne 0 ]; then
+ break;
+ fi
+
+ ## Check match success
+ if [ ${pipestatus[2]} -eq 0 ]; then
success=1;
break;
fi