sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

testprogs/blackbox: add testit[_expect_failure]_grep() to subunit.sh

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2018-09-04 10:38:44 +02:00 committed by Andrew Bartlett
parent 39c281a236
commit 8526feb100
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
testprogs/blackbox/subunit.sh
View File

@ -90,6 +90,31 @@ testit () {
return $status
}
# This returns 0 if the command gave success and the grep value was found
# all other cases return != 0
testit_grep () {
name="$1"
shift
grep="$1"
shift
cmdline="$@"
subunit_start_test "$name"
output=`$cmdline 2>&1`
status=$?
if [ x$status != x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name"
return $status
fi
printf '%s' "$output" | grep -q "$grep"
gstatus=$?
if [ x$gstatus = x0 ]; then
subunit_pass_test "$name"
else
printf 'GREP: "%s" not found in output:\n%s' "$grep" "$output" | subunit_fail_test "$name"
fi
return $status
}
testit_expect_failure () {
name="$1"
shift
@ -105,6 +130,31 @@ testit_expect_failure () {
return $status
}
# This returns 0 if the command gave a failure and the grep value was found
# all other cases return != 0
testit_expect_failure_grep () {
name="$1"
shift
grep="$1"
shift
cmdline="$@"
subunit_start_test "$name"
output=`$cmdline 2>&1`
status=$?
if [ x$status = x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name"
return 1
fi
printf '%s' "$output" | grep -q "$grep"
gstatus=$?
if [ x$gstatus = x0 ]; then
subunit_pass_test "$name"
else
printf 'GREP: "%s" not found in output:\n%s' "$grep" "$output" | subunit_fail_test "$name"
fi
return $status
}
testok () {
name=`basename $1`
failed=$2