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 /erts | |
| 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 'erts')
| -rw-r--r-- | erts/test/upgrade_SUITE.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl index 174c028ac7..f93da8955f 100644 --- a/erts/test/upgrade_SUITE.erl +++ b/erts/test/upgrade_SUITE.erl @@ -54,6 +54,10 @@ init_per_suite(Config) -> Config end. +end_per_suite(_Config) -> + %% This function is required since init_per_suite/1 exists. + ok. + init_per_testcase(Case,Config) -> PrivDir = filename:join([proplists:get_value(data_dir,Config),priv_dir,Case]), CreateDir = filename:join([PrivDir,create]), |