ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 06:03:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix malformed test assert message in executeOk_servald()

Browse Source 
The assertion message was omitting the details of the command executed.
This commit is contained in:
Andrew Bettison 2017-12-06 15:05:25 +10:30
parent 7edf1a912e
commit bc6396ec28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testdefs.sh
View File

@ -99,7 +99,7 @@ extract_stdout_keyvalue_optional() {
# commands that return "key:value\n" pairs. # commands that return "key:value\n" pairs.
extract_stdout_keyvalue() { extract_stdout_keyvalue() {
local _label="$2" local _label="$2"
assert --message="stdout of ($executed) contains valid '$_label:' line" --stdout extract_stdout_keyvalue_optional "$@" assert --message="stdout of ($TFWEXECUTED) contains valid '$_label:' line" --stdout extract_stdout_keyvalue_optional "$@"
} }
# Parse the standard result set output produced by the immediately preceding command # Parse the standard result set output produced by the immediately preceding command
@ -189,7 +189,7 @@ execute_servald() {
# - asserts that standard error contains no error messages # - asserts that standard error contains no error messages
executeOk_servald() { executeOk_servald() {
executeOk --core-backtrace --executable=$servald "$@" executeOk --core-backtrace --executable=$servald "$@"
assertStderrGrep --matches=0 --message="stderr of ($executed) contains no error messages" '^ERROR:' assertStderrGrep --matches=0 --message="stderr of ($TFWEXECUTED) contains no error messages" '^ERROR:'
} }
# Utility function: # Utility function: