diff options
| author | Peter Andersson <[email protected]> | 2015-03-06 12:13:55 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-03-06 12:13:55 +0100 |
| commit | e6d39e161f14f5d9a4dc9c44ee1f31b47343567a (patch) | |
| tree | 48bb13703a3976f4b035981375a929b08ecbe5d8 /lib/common_test/test/ct_hooks_SUITE.erl | |
| parent | e725cd9385f269b501ebc3ca31999ac69706b535 (diff) | |
| parent | eb8b95db65b701ceed13d34350fe2f635d7d9eb5 (diff) | |
| download | otp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.tar.gz otp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.tar.bz2 otp-e6d39e161f14f5d9a4dc9c44ee1f31b47343567a.zip | |
Merge remote-tracking branch 'origin/peppe/common_test/inconsistent_return_value' into maint
* origin/peppe/common_test/inconsistent_return_value:
Add tests
Make it possible to skip test case by returning skipped tag
OTP-12359
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_hooks_SUITE.erl | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl index c8fc4bd59b..d5ad8312e6 100644 --- a/lib/common_test/test/ct_hooks_SUITE.erl +++ b/lib/common_test/test/ct_hooks_SUITE.erl @@ -1075,7 +1075,37 @@ test_events(fail_n_skip_with_minimal_cth) -> {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}, {?eh,cth,{'_',init,['_',[]]}}, {?eh,tc_start,{'_',init_per_suite}}, - + + {parallel, + [{?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,{init_per_group, + group1,[parallel]}}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,{init_per_group, + group1,[parallel]},ok}}, + {parallel, + [{?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,{init_per_group, + group2,[parallel]}}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,{init_per_group, + group2,[parallel]},ok}}, + %% Verify that 'skip' as well as 'skipped' works + {?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,test_case2}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,test_case2,{skipped,"skip it"}}}, + {?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,test_case3}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,test_case3,{skipped,"skip it"}}}, + {?eh,cth,{empty_cth,on_tc_skip,[{test_case2,group2}, + {tc_user_skip,{skipped,"skip it"}}, + []]}}, + {?eh,cth,{empty_cth,on_tc_skip,[{test_case3,group2}, + {tc_user_skip,{skipped,"skip it"}}, + []]}}, + {?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,{end_per_group, + group2,[parallel]}}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,{end_per_group,group2, + [parallel]},ok}}]}, + {?eh,tc_start,{ct_cth_fail_one_skip_one_SUITE,{end_per_group, + group1,[parallel]}}}, + {?eh,tc_done,{ct_cth_fail_one_skip_one_SUITE,{end_per_group, + group1,[parallel]},ok}}]}, + {?eh,tc_done,{'_',end_per_suite,ok}}, {?eh,cth,{'_',terminate,[[]]}}, {?eh,stop_logging,[]} |