From bc6396ec28b69cdd5fb2d15a90fbe8593722a208 Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Wed, 6 Dec 2017 15:05:25 +1030 Subject: [PATCH] Fix malformed test assert message in executeOk_servald() The assertion message was omitting the details of the command executed. --- testdefs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testdefs.sh b/testdefs.sh index 9bcecb41..a510f496 100644 --- a/testdefs.sh +++ b/testdefs.sh @@ -99,7 +99,7 @@ extract_stdout_keyvalue_optional() { # commands that return "key:value\n" pairs. extract_stdout_keyvalue() { 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 @@ -189,7 +189,7 @@ execute_servald() { # - asserts that standard error contains no error messages executeOk_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: