diff options
| author | Siri Hansen <[email protected]> | 2017-02-16 14:15:32 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-02-20 12:40:09 +0100 |
| commit | 8151495812ffabf560958e5434d3edbe46f29695 (patch) | |
| tree | 191012db353dba109664fb2bc4eaa3e5f1791990 /lib/common_test/test | |
| parent | 827732949ba9cd844347bca1a46b2e2055810e69 (diff) | |
| download | otp-8151495812ffabf560958e5434d3edbe46f29695.tar.gz otp-8151495812ffabf560958e5434d3edbe46f29695.tar.bz2 otp-8151495812ffabf560958e5434d3edbe46f29695.zip | |
[ct] Send tc_start event on force_stop and failed sequence
If test cases were skipped because of option {force_stop,skip_rest} or
because of a failed sequence, then no tc_start event would be sent,
only only tc_done. This is now corrected.
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/common_test/test/ct_repeat_testrun_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/common_test/test/ct_test_server_if_1_SUITE.erl | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl index e5d8f15453..7c589cea4f 100644 --- a/lib/common_test/test/ct_hooks_SUITE.erl +++ b/lib/common_test/test/ct_hooks_SUITE.erl @@ -2102,6 +2102,7 @@ test_events(failed_sequence) -> {?eh,cth,{empty_cth,on_tc_fail, [seq_SUITE,test_case_1,{failed,failed_on_purpose},[]]}}, {?eh,test_stats,{0,1,{0,0}}}, + {?eh,tc_start,{seq_SUITE,test_case_2}}, {?eh,tc_done,{seq_SUITE,test_case_2, {auto_skipped,{sequence_failed,seq1,test_case_1}}}}, {?eh,cth,{empty_cth,on_tc_skip, @@ -2149,6 +2150,7 @@ test_events(repeat_force_stop) -> [repeat_SUITE,test_case_1,'$proplist',ok,[]]}}, {?eh,tc_done,{repeat_SUITE,test_case_1,ok}}, {?eh,test_stats,{1,0,{0,0}}}, + {?eh,tc_start,{repeat_SUITE,test_case_2}}, {?eh,tc_done,{repeat_SUITE,test_case_2, {auto_skipped, "Repeated test stopped by force_stop option"}}}, diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl index f8b6a379f6..76611a2db3 100644 --- a/lib/common_test/test/ct_repeat_testrun_SUITE.erl +++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl @@ -363,14 +363,17 @@ skip_first_tc1(Suite) -> {?eh,tc_start,{Suite,tc1}}, {?eh,tc_done,{Suite,tc1,ok}}, {?eh,test_stats,{'_',0,{0,0}}}, + {?eh,tc_start,{Suite,tc2}}, {?eh,tc_done,{Suite,tc2,?skipped}}, {?eh,test_stats,{'_',0,{0,1}}}, + {?eh,tc_start,{Suite,{init_per_group,g,[]}}}, {?eh,tc_done,{Suite,{init_per_group,g,[]},?skipped}}, {?eh,tc_auto_skip,{Suite,{tc1,g},?skip_reason}}, {?eh,test_stats,{'_',0,{0,2}}}, {?eh,tc_auto_skip,{Suite,{tc2,g},?skip_reason}}, {?eh,test_stats,{'_',0,{0,3}}}, {?eh,tc_auto_skip,{Suite,{end_per_group,g},?skip_reason}}, + {?eh,tc_start,{Suite,tc2}}, {?eh,tc_done,{Suite,tc2,?skipped}}, {?eh,test_stats,{'_',0,{0,4}}}, {?eh,tc_start,{Suite,end_per_suite}}, @@ -390,10 +393,12 @@ skip_tc1_in_group(Suite) -> {?eh,tc_start,{Suite,tc1}}, {?eh,tc_done,{Suite,tc1,ok}}, {?eh,test_stats,{'_',0,{0,0}}}, + {?eh,tc_start,{Suite,tc2}}, {?eh,tc_done,{Suite,tc2,?skipped}}, {?eh,test_stats,{'_',0,{0,1}}}, {?eh,tc_start,{Suite,{end_per_group,g,[]}}}, {?eh,tc_done,{Suite,{end_per_group,g,[]},ok}}], + {?eh,tc_start,{Suite,tc2}}, {?eh,tc_done,{Suite,tc2,?skipped}}, {?eh,test_stats,{'_',0,{0,2}}}, {?eh,tc_start,{Suite,end_per_suite}}, 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 228d900545..ea8a1a5662 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 @@ -161,6 +161,7 @@ test_events(ts_if_1) -> {?eh,tc_start,{ts_if_1_SUITE,tc4}}, {?eh,tc_done,{ts_if_1_SUITE,tc4,{failed,{error,failed_on_purpose}}}}, {?eh,test_stats,{1,2,{0,1}}}, + {?eh,tc_start,{ts_if_1_SUITE,tc5}}, {?eh,tc_done,{ts_if_1_SUITE,tc5,{auto_skipped,{sequence_failed,seq1,tc4}}}}, {?eh,test_stats,{1,2,{0,2}}}, |