From 66ee788a5a7e882f84fe44e1c933b2df1033b1a9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 29 Mar 2017 11:53:41 +0200 Subject: [PATCH] testprogs/blackbox: add test_rpcclient_*_grep helper functions BUG: https://bugzilla.samba.org/show_bug.cgi?id=12709 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- testprogs/blackbox/common_test_fns.inc | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc index 7e54c673777..f77879ae39f 100755 --- a/testprogs/blackbox/common_test_fns.inc +++ b/testprogs/blackbox/common_test_fns.inc @@ -36,3 +36,55 @@ test_smbclient_expect_failure() { fi return $status } + +test_rpcclient_grep() { + name="$1" + cmd="$2" + srv="$3" + grep="$4" + shift + shift + shift + shift + subunit_start_test "$name" + output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1` + status=$? + if [ x$status != x0 ]; then + echo "$output" | subunit_fail_test "$name" + return $status + fi + echo "$output" | grep -q "$grep" + gstatus=$? + if [ x$gstatus = x0 ]; then + subunit_pass_test "$name" + else + echo "$output" | subunit_fail_test "$name" + fi + return $status +} + +test_rpcclient_expect_failure_grep() { + name="$1" + cmd="$2" + srv="$3" + grep="$4" + shift + shift + shift + shift + subunit_start_test "$name" + output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1` + status=$? + if [ x$status = x0 ]; then + echo "$output" | subunit_fail_test "$name" + return $status + fi + echo "$output" | grep -q "$grep" + gstatus=$? + if [ x$gstatus = x0 ]; then + subunit_pass_test "$name" + else + echo "$output" | subunit_fail_test "$name" + fi + return $status +} -- 2.11.4.GIT