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

Improve test framework: begin/end_fixture

Browse Source 
Two new functions to allow parts of a test case test_xxx() function
to be treated as setup, so that a failure will result in an ERROR
not a FAIL
This commit is contained in:
Andrew Bettison 2015-03-02 12:11:56 +10:30
parent a9b9f51a9f
commit 6824977800
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
testframework.sh
View File

@ -436,6 +436,11 @@ runTests() {
$_tfw_trace && set -x $_tfw_trace && set -x
test_$testName test_$testName
set +x set +x
case $_tfw_phase in
testcase-setup) _tfw_error "test terminated within fixture (missing a end_fixture call?)";;
testcase);;
*) _tfw_fatal "internal error: _tfw_phase=$_tfw_phase";;
esac
_tfw_result=PASS _tfw_result=PASS
exit 0 exit 0
) <&- 5>&1 5>&2 6>"$_tfw_tmp/log.stdout" 1>&6 2>"$_tfw_tmp/log.stderr" 7>"$_tfw_tmp/log.xtrace" ) <&- 5>&1 5>&2 6>"$_tfw_tmp/log.stdout" 1>&6 2>"$_tfw_tmp/log.stderr" 7>"$_tfw_tmp/log.xtrace"
@ -1434,7 +1439,6 @@ _tfw_filter_predicate() {
# or teardown is treated as an error, not a failure. # or teardown is treated as an error, not a failure.
_tfw_failmsg() { _tfw_failmsg() {
# A failure during setup or teardown is treated as an error.
case $_tfw_phase in case $_tfw_phase in
testcase|finalise) testcase|finalise)
if ! $_tfw_opt_error_on_fail; then if ! $_tfw_opt_error_on_fail; then
@ -1443,6 +1447,7 @@ _tfw_failmsg() {
fi fi
;; ;;
esac esac
# A failure during setup or teardown is treated as an error.
tfw_log "ERROR: $*" tfw_log "ERROR: $*"
} }
@ -1562,6 +1567,25 @@ teardown() {
# The following functions are essential for writing test cases and fixtures. # The following functions are essential for writing test cases and fixtures.
# Within a test_xxx() function, commands executed between begin_fixture and
# end_fixture invocations are treated as setup, not test, so that a failure
# results in ERROR not FAIL.
begin_fixture() {
case $_tfw_phase in
testcase) _tfw_phase=testcase-setup;;
testcase-setup) _tfw_error "begin_fixture: already in fixture (missing a prior end_fixture call?)";;
*) _tfw_error "begin_fixture: not allowed here (only in test_xxx functions)";;
esac
}
end_fixture() {
case $_tfw_phase in
testcase-setup) _tfw_phase=testcase;;
testcase) _tfw_error "end_fixture: not in fixture (missing a prior begin_fixture call?)";;
*) _tfw_error "end_fixture: not allowed here (only in test_xxx functions)";;
esac
}
# Executes its arguments as a command in the current shell process (not in a # Executes its arguments as a command in the current shell process (not in a
# child process), so that side effects like functions setting variables will # child process), so that side effects like functions setting variables will
# have effect. # have effect.