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_test_server_if_1_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_test_server_if_1_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_test_server_if_1_SUITE.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl index efc0309781..8825d84884 100644 --- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl +++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl @@ -242,25 +242,28 @@ test_events(ts_if_1) -> {?eh,tc_auto_skip,{ts_if_5_SUITE,end_per_suite, {require_failed_in_suite0,{not_available,undef_variable}}}}, - {?eh,tc_start,{ts_if_6_SUITE,tc1}}, - {?eh,tc_done,{ts_if_6_SUITE,tc1,{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}}, - {?eh,test_stats,{3,5,{6,8}}}, + {?eh,tc_start,{ct_framework,init_per_suite}}, + {?eh,tc_done,{ct_framework,init_per_suite, + {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}}, + {?eh,tc_auto_skip,{ts_if_6_SUITE,tc1, + {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}}, + {?eh,test_stats,{3,5,{5,9}}}, {?eh,tc_start,{ts_if_7_SUITE,tc1}}, {?eh,tc_done,{ts_if_7_SUITE,tc1,ok}}, - {?eh,test_stats,{4,5,{6,8}}}, + {?eh,test_stats,{4,5,{5,9}}}, {?eh,tc_start,{ts_if_8_SUITE,tc1}}, {?eh,tc_done,{ts_if_8_SUITE,tc1,{failed,{error,failed_on_purpose}}}}, - {?eh,test_stats,{4,6,{6,8}}}, + {?eh,test_stats,{4,6,{5,9}}}, {?eh,tc_user_skip,{skipped_by_spec_1_SUITE,all,"should be skipped"}}, - {?eh,test_stats,{4,6,{7,8}}}, + {?eh,test_stats,{4,6,{6,9}}}, {?eh,tc_start,{skipped_by_spec_2_SUITE,init_per_suite}}, {?eh,tc_done,{skipped_by_spec_2_SUITE,init_per_suite,ok}}, {?eh,tc_user_skip,{skipped_by_spec_2_SUITE,tc1,"should be skipped"}}, - {?eh,test_stats,{4,6,{8,8}}}, + {?eh,test_stats,{4,6,{7,9}}}, {?eh,tc_start,{skipped_by_spec_2_SUITE,end_per_suite}}, {?eh,tc_done,{skipped_by_spec_2_SUITE,end_per_suite,ok}}, |