Add tests

5 files changed, 56 insertions, 9 deletions

diff --git a/lib/common_test/test/ct_event_handler_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE.erl
index b534a7141d..30a5e650fe 100644
--- a/lib/common_test/test/ct_event_handler_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE.erl
@@ -156,18 +156,21 @@ results(Config) when is_list(Config) ->
     TestEvents =
 	[{eh_A,start_logging,{'DEF','RUNDIR'}},
 	 {eh_A,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-	 {eh_A,start_info,{1,1,3}},
+	 {eh_A,start_info,{1,1,4}},
 	 {eh_A,tc_start,{eh_11_SUITE,init_per_suite}},
 	 {eh_A,tc_done,{eh_11_SUITE,init_per_suite,ok}},
 	 {eh_A,tc_start,{eh_11_SUITE,tc1}},
 	 {eh_A,tc_done,{eh_11_SUITE,tc1,ok}},
 	 {eh_A,test_stats,{1,0,{0,0}}},
 	 {eh_A,tc_start,{eh_11_SUITE,tc2}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc2,{skipped,"Skipped"}}},
+	 {eh_A,tc_done,{eh_11_SUITE,tc2,{skipped,"Skip"}}},
 	 {eh_A,test_stats,{1,0,{1,0}}},
 	 {eh_A,tc_start,{eh_11_SUITE,tc3}},
-	 {eh_A,tc_done,{eh_11_SUITE,tc3,{failed,{error,'Failing'}}}},
-	 {eh_A,test_stats,{1,1,{1,0}}},
+	 {eh_A,tc_done,{eh_11_SUITE,tc3,{skipped,"Skipped"}}},
+	 {eh_A,test_stats,{1,0,{2,0}}},
+	 {eh_A,tc_start,{eh_11_SUITE,tc4}},
+	 {eh_A,tc_done,{eh_11_SUITE,tc4,{failed,{error,'Failing'}}}},
+	 {eh_A,test_stats,{1,1,{2,0}}},
 	 {eh_A,tc_start,{eh_11_SUITE,end_per_suite}},
 	 {eh_A,tc_done,{eh_11_SUITE,end_per_suite,ok}},
 	 {eh_A,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
index 16b7129993..a52fe96f30 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/event_handling_1/test/eh_11_SUITE.erl
@@ -124,7 +124,7 @@ end_per_testcase(_TestCase, _Config) ->
 %% Description: Returns the list of test cases that are to be executed.
 %%--------------------------------------------------------------------
 all() -> 
-    [tc1, tc2, tc3].
+    [tc1, tc2, tc3, tc4].
 
 
 %%--------------------------------------------------------------------
@@ -135,7 +135,10 @@ tc1(_Config) ->
     ok.
 
 tc2(_Config) -> 
-    {skip,"Skipped"}.
+    {skip,"Skip"}.
 
-tc3(_Config) ->
+tc3(_Config) -> 
+    {skipped,"Skipped"}.
+
+tc4(_Config) ->
     exit('Failing').
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,[]}
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl
index b2f22d8257..7b84c246ca 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl
@@ -41,6 +41,8 @@ end_per_group(_Group,_Config) ->
 

 init_per_testcase(test_case2, Config) ->

     {skip,"skip it"};

+init_per_testcase(test_case3, Config) ->

+    {skipped,"skip it"};

 init_per_testcase(_TestCase, Config) ->

     Config.

 

@@ -48,7 +50,9 @@ end_per_testcase(_TestCase, _Config) ->
     ok.

 

 groups() ->

-    [{group1,[parallel],[{group2,[parallel],[test_case1,test_case2,test_case3]}]}].

+    [{group1,[parallel],

+      [{group2,[parallel],

+	[test_case1,test_case2,test_case3,test_case4]}]}].

 

 all() ->

     [{group,group1}].

@@ -62,3 +66,6 @@ test_case2(Config) ->
 

 test_case3(Config) ->

     ok.

+

+test_case4(Config) ->

+    ok.

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
index 30721a6b3a..436470f46d 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
@@ -28,10 +28,14 @@
 %% CT Hooks

 -export([init/2]).

 -export([terminate/1]).

+-export([on_tc_skip/3]).

 

 init(Id, Opts) ->

     empty_cth:init(Id, Opts).

 

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

 terminate(State) ->

     empty_cth:terminate(State).