diff options
| author | Peter Andersson <[email protected]> | 2014-03-12 17:18:40 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-03-12 17:19:27 +0100 |
| commit | 2aca59eb432c8907ac9d316da251a513fcc33901 (patch) | |
| tree | 09df30769c781d415ab12f0fa8c75163fb70ed5b /lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl | |
| parent | f406a1661f8b0106b1b203057aedbb60d8d3a6be (diff) | |
| parent | 0b2bc007ec8b2f393ae4888be2efe3c4f9f2b94c (diff) | |
| download | otp-2aca59eb432c8907ac9d316da251a513fcc33901.tar.gz otp-2aca59eb432c8907ac9d316da251a513fcc33901.tar.bz2 otp-2aca59eb432c8907ac9d316da251a513fcc33901.zip | |
Merge branch 'peppe/common_test/group_events'
* peppe/common_test/group_events:
Update test suites and fix various remaining problems
Update event protocol and CT Hooks API
Introduce group name for skipped cases in events, hooks and overview log
OTP-11732
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl index 9ee2a90896..6caac7e447 100644 --- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl +++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl @@ -229,9 +229,9 @@ post_end_per_testcase(TC,Config,Return,State) -> %% This function should be used for extra cleanup which might be needed. %% It is not possible to modify the config or the status of the test run. -spec on_tc_fail(TC :: init_per_suite | end_per_suite | - init_per_group | end_per_group | atom(), - Reason :: term(), State :: #state{}) -> - NewState :: #state{}. + init_per_group | end_per_group | atom() | + {Function :: atom(), GroupName :: atom()}, + Reason :: term(), State :: #state{}) -> NewState :: #state{}. on_tc_fail(TC, Reason, State) -> gen_event:notify( ?CT_EVMGR_REF, #event{ name = cth, node = node(), @@ -243,11 +243,11 @@ on_tc_fail(TC, Reason, State) -> %% or due to an init function failing. Test case can be %% end_per_suite, init_per_group, end_per_group and the actual test cases. -spec on_tc_skip(TC :: end_per_suite | - init_per_group | end_per_group | atom(), + init_per_group | end_per_group | atom() | + {Function :: atom(), GroupName :: atom()}, {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), Reason :: term()}}} | - {tc_user_skip, {skipped, Reason :: term()}}, - State :: #state{}) -> - NewState :: #state{}. + {tc_user_skip, {skipped, Reason :: term()}}, + State :: #state{}) -> NewState :: #state{}. on_tc_skip(TC, Reason, State) -> gen_event:notify( ?CT_EVMGR_REF, #event{ name = cth, node = node(), |