diff options
| author | Siri Hansen <[email protected]> | 2017-03-06 08:51:22 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-03-06 08:51:22 +0100 |
| commit | 0e0155410734e04556ceecb1222dd2ef956b4177 (patch) | |
| tree | a714e355d78f4c96f1644ab64783a1a0a32d4da7 /lib/common_test/src/cth_conn_log.erl | |
| parent | 0438c6c2c5c4a447ab3a47a443968488a0d835eb (diff) | |
| parent | 50cf93672b8abb21f1455d41d333481071e6194e (diff) | |
| download | otp-0e0155410734e04556ceecb1222dd2ef956b4177.tar.gz otp-0e0155410734e04556ceecb1222dd2ef956b4177.tar.bz2 otp-0e0155410734e04556ceecb1222dd2ef956b4177.zip | |
Merge branch 'siri/ct_hooks/callbacks-on-skip/OTP-10599' into maint
* siri/ct_hooks/callbacks-on-skip/OTP-10599:
[ct] Update built-in ct hooks with new Suite parameter
[cth_surefire] Handle skips from test spec
[ct] Remove excessive skipped/failed tag in hook function
[ct] Send tc_start event on force_stop and failed sequence
[ct] Correctly handle process died in init and end_per_testcase
[ct] Fix faulty hook callbacks for skipped tests
Add dummy end_per_suite/1
[ct] Fix hooks and fail when one of init/end_per_* does not exit
[ct] Add Suite argument to hook callback functions
[ct] Fix function_clause in ct_framework when hook function crashes
Diffstat (limited to 'lib/common_test/src/cth_conn_log.erl')
| -rw-r--r-- | lib/common_test/src/cth_conn_log.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl index 883da0da0a..ce8852b3ea 100644 --- a/lib/common_test/src/cth_conn_log.erl +++ b/lib/common_test/src/cth_conn_log.erl @@ -54,8 +54,8 @@ -include_lib("common_test/include/ct.hrl"). -export([init/2, - pre_init_per_testcase/3, - post_end_per_testcase/4]). + pre_init_per_testcase/4, + post_end_per_testcase/5]). %%---------------------------------------------------------------------- %% Exported types @@ -104,7 +104,7 @@ get_log_opts(Mod,Opts) -> Hosts = proplists:get_value(hosts,Opts,[]), {LogType,Hosts}. -pre_init_per_testcase(TestCase,Config,CthState) -> +pre_init_per_testcase(_Suite,TestCase,Config,CthState) -> Logs = lists:map( fun({ConnMod,{LogType,Hosts}}) -> @@ -158,7 +158,7 @@ pre_init_per_testcase(TestCase,Config,CthState) -> ct_util:update_testdata(?MODULE, Update, [create]), {Config,CthState}. -post_end_per_testcase(TestCase,_Config,Return,CthState) -> +post_end_per_testcase(_Suite,TestCase,_Config,Return,CthState) -> Update = fun(PrevUsers) -> case lists:delete(TestCase, PrevUsers) of |