diff options
| author | Lukas Larsson <[email protected]> | 2011-02-17 17:07:05 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-17 17:09:38 +0100 |
| commit | 53974a3517268389ae18fabee509ebf4bbfce747 (patch) | |
| tree | 208575bf9ac4916c6b60e052c6f712986c3f0de9 /lib/test_server/src/test_server_ctrl.erl | |
| parent | b83388e78e72e66f4e0dae42083a6bcd9709922e (diff) | |
| parent | d87708bf18d29c0a66f6654368b4553067e62394 (diff) | |
| download | otp-53974a3517268389ae18fabee509ebf4bbfce747.tar.gz otp-53974a3517268389ae18fabee509ebf4bbfce747.tar.bz2 otp-53974a3517268389ae18fabee509ebf4bbfce747.zip | |
Merge branch 'lukas/common_test/suite_callback/OTP-8851' into dev
* lukas/common_test/suite_callback/OTP-8851: (54 commits)
Update example cth spec to reflect the implementation
Cleanup code to fix dialyzer warning
Rename Suite Callback to Common Test hook in documentation
Rename Suite Callback to Common Test Hook in code and testcases
Fix bug where the state of an SCB was altered when no on_tc_* existed
Update SCBs to use a specific id/1 function for SCb overriding instead of returning it from init/1.
Add documentation for SCBs
Update suite callback test timeout so that beam debug test runs do not timeout
Update test support so that if common test fails to be stopped in a suite, the ct node is restarted and the test case fails
Add tests for SCB's with same id and fixed bug relating to it
Add test suites for failing in init/1 function
Added tests for starting SCB's with arguments and fixed a bug with how SCB's are parsed from the command line
Add so that failures in SCB:init/1 causes the entire scb scope to fail
Fix bug which caused scb to be added too much when initiated in the suite info function
Started work on documenting suite callbacks, this is a partial commit
Add locking mechanism for scb state when using parallel groups
Add state update tests for suite callbacks
Update ct_framework calls to allow manipulation of test results in end_tc without breaking backwards compatability (I hope)
Add test case for init_per_suite recover scenario
Add testcase for config updates
...
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 1dc5646184..977a2b1785 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -3552,7 +3552,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, {_,{'EXIT',Reason}} -> progress(failed, Num, Mod, Func, Loc, Reason, Time, Comment, Style); - {_, {failed, Reason}} -> + {_, {Fail, Reason}} when Fail =:= fail; Fail =:= failed -> progress(failed, Num, Mod, Func, Loc, Reason, Time, Comment, Style); {_, {Skip, Reason}} when Skip==skip; Skip==skipped -> |