From 7e6395bd8e1810ba8c4614afe15616378b5f7ef5 Mon Sep 17 00:00:00 2001
From: Kaushal M <kaushal@redhat.com>
Date: Tue, 18 Dec 2012 18:44:54 +0530
Subject: 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>
---
 tests/include.rc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'tests/include.rc')

diff --git a/tests/include.rc b/tests/include.rc
index f5cab1f66..90bcb8ec7 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
-- 
cgit