diff options
| author | Peter Andersson <[email protected]> | 2012-03-20 09:34:38 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-20 09:34:48 +0100 |
| commit | f16576b473d4f514197d6262e7a4c4a23c00d9e5 (patch) | |
| tree | 6cef1aeab359ebc5adbd8b0c02aeb7871fbe87a0 /lib/common_test/test/ct_groups_test_2_SUITE.erl | |
| parent | eb8c407eabfac8696f0ff235ce9d31af5698cf53 (diff) | |
| parent | 7b16f86fb5933a94b21a11391dc37562283991da (diff) | |
| download | otp-f16576b473d4f514197d6262e7a4c4a23c00d9e5.tar.gz otp-f16576b473d4f514197d6262e7a4c4a23c00d9e5.tar.bz2 otp-f16576b473d4f514197d6262e7a4c4a23c00d9e5.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9880_9986_9989' into maint
* origin/peppe/common_test/otp-9880_9986_9989:
Fix error with group config deleted before post_end_per_group
Introduce new test suite for CTHs
Fix bug in handling ct_hooks start arguments
Use calls to ct_framework:init/end_per_suite for configuration
Change ct_init/end_per_group to init/end_per_group
Run hooks for non-existing config functions
OTP-9880
OTP-9986
OTP-9989
OTP-9992
Diffstat (limited to 'lib/common_test/test/ct_groups_test_2_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_groups_test_2_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl index 2392b0b850..c3601ba0ce 100644 --- a/lib/common_test/test/ct_groups_test_2_SUITE.erl +++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl @@ -171,16 +171,16 @@ test_events(missing_conf) -> {?eh,start_logging,{'DEF','RUNDIR'}}, {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, {?eh,start_info,{1,1,2}}, - {?eh,tc_start,{ct_framework,{ct_init_per_group,group1,[]}}}, - {?eh,tc_done,{ct_framework,{ct_init_per_group,group1,[]},ok}}, + {?eh,tc_start,{ct_framework,{init_per_group,group1,[]}}}, + {?eh,tc_done,{ct_framework,{init_per_group,group1,[]},ok}}, {?eh,tc_start,{missing_conf_SUITE,tc1}}, {?eh,tc_done,{missing_conf_SUITE,tc1,ok}}, {?eh,test_stats,{1,0,{0,0}}}, {?eh,tc_start,{missing_conf_SUITE,tc2}}, {?eh,tc_done,{missing_conf_SUITE,tc2,ok}}, {?eh,test_stats,{2,0,{0,0}}}, - {?eh,tc_start,{ct_framework,{ct_end_per_group,group1,[]}}}, - {?eh,tc_done,{ct_framework,{ct_end_per_group,group1,[]},ok}}, + {?eh,tc_start,{ct_framework,{end_per_group,group1,[]}}}, + {?eh,tc_done,{ct_framework,{end_per_group,group1,[]},ok}}, {?eh,test_done,{'DEF','STOP_TIME'}}, {?eh,stop_logging,[]} ]; |