diff options
| author | Erlang/OTP <[email protected]> | 2019-06-14 08:47:44 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-14 08:47:44 +0200 |
| commit | 54eec90366a910e28272fa3d33e688c22c91ec7f (patch) | |
| tree | 1178452341439afce00245d99f6ce27d53c3c7bf /lib/common_test/test/ct_hooks_SUITE.erl | |
| parent | d2ea4fb717bad10971932a7c2c995942156d869e (diff) | |
| parent | fe8521bf93994a1d0d2021099f3a99473e1d3731 (diff) | |
| download | otp-54eec90366a910e28272fa3d33e688c22c91ec7f.tar.gz otp-54eec90366a910e28272fa3d33e688c22c91ec7f.tar.bz2 otp-54eec90366a910e28272fa3d33e688c22c91ec7f.zip | |
Merge branch 'siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863' into maint-20
* siri/ct/hook-terminated-not-initiated/ERIERL-370/OTP-15863:
[ct] Fix bug where Hook:terminate/1 was called before Hook:init/2
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl index edcfec4fb5..35afcde092 100644 --- a/lib/common_test/test/ct_hooks_SUITE.erl +++ b/lib/common_test/test/ct_hooks_SUITE.erl @@ -666,9 +666,15 @@ test_events(scope_suite_cth) -> {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, %% check that post_groups and post_all comes before init when hook %% is installed in suite/0 + %% And there should be no terminate after these, since init is + %% not yet called. {?eh,cth,{'_',post_groups,['_',[]]}}, - {?eh,cth,{'_',post_all,['_','_',[]]}}, - {?eh,tc_start,{ct_scope_suite_cth_SUITE,init_per_suite}}, + {negative, + {?eh,cth,{'_',terminate,['_']}}, + {?eh,cth,{'_',post_all,['_','_',[]]}}}, + {negative, + {?eh,cth,{'_',terminate,['_']}}, + {?eh,tc_start,{ct_scope_suite_cth_SUITE,init_per_suite}}}, {?eh,cth,{'_',id,[[]]}}, {?eh,cth,{'_',init,['_',[]]}}, {?eh,cth,{'_',pre_init_per_suite,[ct_scope_suite_cth_SUITE,'$proplist',[]]}}, |