lib/tests: Don't return non-zero values from checks
The exit codes aren't used for anything.
This commit is contained in:
parent
40ae711f73
commit
bfc580f54f
|
@ -32,11 +32,9 @@ checkConfigOutput() {
|
||||||
shift
|
shift
|
||||||
if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
|
if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
|
||||||
pass=$((pass + 1))
|
pass=$((pass + 1))
|
||||||
return 0
|
|
||||||
else
|
else
|
||||||
echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
|
echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
|
||||||
reportFailure "$@"
|
reportFailure "$@"
|
||||||
return 1
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,15 +45,12 @@ checkConfigError() {
|
||||||
if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then
|
if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then
|
||||||
echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
|
echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
|
||||||
reportFailure "$@"
|
reportFailure "$@"
|
||||||
return 1
|
|
||||||
else
|
else
|
||||||
if echo "$err" | grep -zP --silent "$errorContains" ; then
|
if echo "$err" | grep -zP --silent "$errorContains" ; then
|
||||||
pass=$((pass + 1))
|
pass=$((pass + 1))
|
||||||
return 0
|
|
||||||
else
|
else
|
||||||
echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
|
echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
|
||||||
reportFailure "$@"
|
reportFailure "$@"
|
||||||
return 1
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue