From 8c6e37e142ca42641650a9f0bf285635f1f7eed7 Mon Sep 17 00:00:00 2001 From: Frank Liepold Date: Tue, 4 Mar 2014 09:22:58 +0100 Subject: [PATCH] test_suite: print only result line to stdout --- test_suite/mars/modules/marsview.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test_suite/mars/modules/marsview.sh b/test_suite/mars/modules/marsview.sh index cc1f5148..fa9aa8b9 100644 --- a/test_suite/mars/modules/marsview.sh +++ b/test_suite/mars/modules/marsview.sh @@ -10,23 +10,24 @@ function marsview_get for (( ; ; )); do result_line=($(lib_remote_idfile $host marsview $res | head -1)) || \ lib_exit 1 - lib_vmsg " result_line: ${result_line[*]}" + echo "${result_line[*]}" check_line=($(lib_remote_idfile $host marsadm view-1and1 $res \ 2>$tmp_err | head -1)) || \ { cat $tmp_err >&2; lib_exit 1; } if [ -s $tmp_err ]; then - lib_vmsg " marsadm view-1and1 had errors:" + lib_vmsg " marsadm view-1and1 had errors:" >&2 cat $tmp_err >&2 fi [ "${result_line[*]}" = "${check_line[*]}" ] && break + lib_vmsg " result_line: ${result_line[*]}" >&2 lib_vmsg " check_line : ${check_line[*]}" >&2 lib_remote_idfile $host "marsadm view-1and1 all; marsadm view-the-msg all; marsadm view-the-global-msg; true" if grep -q "SPLIT BRAIN" $tmp_err; then - lib_vmsg " COMPARE IGNORED" + lib_vmsg " COMPARE IGNORED" >&2 break fi if [[ "${check_line[*]}" =~ "PrimaryUnreachable" ]]; then - lib_vmsg " COMPARE UNREACHABLE" + lib_vmsg " COMPARE UNREACHABLE" >&2 break fi sleep 2