Merge branch 'maint'

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,[]}