diff options
| author | Lukas Larsson <[email protected]> | 2011-03-22 18:36:54 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-03-22 18:36:54 +0100 |
| commit | 1fac6e5ea2a2932e960ee5ba8ae941744a5306f0 (patch) | |
| tree | 96c22f62d8378b517eb2f4e20a37d7c9f6661372 /lib/common_test/test/ct_hooks_SUITE.erl | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-1fac6e5ea2a2932e960ee5ba8ae941744a5306f0.tar.gz otp-1fac6e5ea2a2932e960ee5ba8ae941744a5306f0.tar.bz2 otp-1fac6e5ea2a2932e960ee5ba8ae941744a5306f0.zip | |
Fix bug which would make cth's to not be removed when out of scope when adding a cth in suite/0 and crashing in pre_init_per_suite.
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE.erl | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl index 64f4e277ff..5479e6943d 100644 --- a/lib/common_test/test/ct_hooks_SUITE.erl +++ b/lib/common_test/test/ct_hooks_SUITE.erl @@ -79,7 +79,8 @@ all(suite) -> scope_per_suite_cth, scope_per_group_cth, scope_suite_cth, scope_per_suite_state_cth, scope_per_group_state_cth, scope_suite_state_cth, - fail_pre_suite_cth, fail_post_suite_cth, skip_pre_suite_cth, + fail_pre_suite_cth, double_fail_pre_suite_cth, + fail_post_suite_cth, skip_pre_suite_cth, skip_post_suite_cth, recover_post_suite_cth, update_config_cth, state_update_cth, options_cth, same_id_cth, fail_n_skip_with_minimal_cth @@ -167,6 +168,11 @@ fail_pre_suite_cth(Config) when is_list(Config) -> do_test(fail_pre_suite_cth, "ct_cth_empty_SUITE.erl", [fail_pre_suite_cth],Config). +double_fail_pre_suite_cth(Config) when is_list(Config) -> + do_test(double_fail_pre_suite_cth, "{ct_scope_suite_crash_in_cth_SUITE.erl," + "ct_scope_suite_cth_SUITE.erl}", + [],Config). + fail_post_suite_cth(Config) when is_list(Config) -> do_test(fail_post_suite_cth, "ct_cth_empty_SUITE.erl", [fail_post_suite_cth],Config). @@ -646,6 +652,23 @@ test_events(fail_pre_suite_cth) -> {?eh,stop_logging,[]} ]; +test_events(double_fail_pre_suite_cth) -> + [ + {?eh,start_logging,{'DEF','RUNDIR'}}, + {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, + {?eh,tc_start,{'_',init_per_suite}}, + {?eh,cth,{'_',init,['_',[]]}}, + {?eh,cth,{'_',pre_init_per_suite,['_','$proplist',[]]}}, + {?eh,cth,{'_',post_init_per_suite,['_','$proplist', + {fail,"Test failure"},[]]}}, + {?eh,cth, {empty_cth,terminate,[[]]}}, + + {?eh,tc_start,{'_',init_per_suite}}, + {?eh,cth,{'_',init,['_',[]]}}, + {?eh,cth, {empty_cth,terminate,[[]]}}, + {?eh,stop_logging,[]} + ]; + test_events(fail_post_suite_cth) -> [ {?eh,start_logging,{'DEF','RUNDIR'}}, |