ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 19:14:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve test framework: better log messages from assertGrep

Browse Source
This commit is contained in:
Andrew Bettison 2012-08-20 18:32:58 +09:30
parent b9874af3b9
commit 3d82983888
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testframework.sh
View File

@ -1047,6 +1047,7 @@ _tfw_assert_grep() {
local matches=$(( $(grep --regexp="$pattern" "$file" | wc -l) + 0 ))
local done=false
local ret=0
local info="$matches match"$([ $matches -ne 1 ] && echo "es")
local oo
_tfw_shopt oo -s extglob
case "$_tfw_opt_matches" in
@ -1056,7 +1057,7 @@ _tfw_assert_grep() {
if [ $matches -ne 0 ]; then
tfw_log "# assert $message"
else
_tfw_failmsg "assertion failed: $message"
_tfw_failmsg "assertion failed ($info): $message"
ret=1
fi
;;
@ -1069,7 +1070,7 @@ _tfw_assert_grep() {
if [ $matches -eq $_tfw_opt_matches ]; then
tfw_log "# assert $message"
else
_tfw_failmsg "assertion failed: $message"
_tfw_failmsg "assertion failed ($info): $message"
ret=1
fi
;;
@ -1083,7 +1084,7 @@ _tfw_assert_grep() {
if [ $matches -ge $bound ]; then
tfw_log "# assert $message"
else
_tfw_failmsg "assertion failed: $message"
_tfw_failmsg "assertion failed ($info): $message"
ret=1
fi
;;
@ -1097,7 +1098,7 @@ _tfw_assert_grep() {
if [ $matches -le $bound ]; then
tfw_log "# assert $message"
else
_tfw_failmsg "assertion failed: $message"
_tfw_failmsg "assertion failed ($info): $message"
ret=1
fi
;;