Merge pull request #8661 from hercules-ci/test-reformat-error-message

tests: Reformat exit code error message
NixOS · Aug 25, 2023 · dd9f816 · dd9f816
2 parents cbd8956 + 3b3822e
commit dd9f816
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/common/vars-and-functions.sh.in b/tests/common/vars-and-functions.sh.in
@@ -195,7 +195,7 @@ expect() {
  shift
  "$@" && res=0 || res="$?"
  if [[ $res -ne $expected ]]; then
- echo "Expected '$expected' but got '$res' while running '${*@Q}'" >&2
+ echo "Expected exit code '$expected' but got '$res' from command ${*@Q}" >&2
  return 1
  fi
  return 0
@@ -209,7 +209,7 @@ expectStderr() {
  shift
  "$@" 2>&1 && res=0 || res="$?"
  if [[ $res -ne $expected ]]; then
- echo "Expected '$expected' but got '$res' while running '${*@Q}'" >&2
+ echo "Expected exit code '$expected' but got '$res' from command ${*@Q}" >&2
  return 1
  fi
  return 0