Merge branch 'maint'

6 files changed, 116 insertions, 39 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).

     

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index a4f7d24540..0e685a2d8a 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -130,7 +130,8 @@ cover_compile(CoverInfo=#cover{app=App,excl=all,incl=Include,cross=Cross}) ->
 	    io:fwrite("done\n\n",[]),
 	    {ok,CoverInfo#cover{mods=Include}}
     end;
-cover_compile(CoverInfo=#cover{app=App,excl=Exclude,incl=Include,cross=Cross}) ->
+cover_compile(CoverInfo=#cover{app=App,excl=Exclude,
+			       incl=Include,cross=Cross}) ->
     CrossMods = lists:flatmap(fun({_,M}) -> M end,Cross),
     case code:lib_dir(App) of
 	{error,bad_name} ->
@@ -737,7 +738,9 @@ do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
 		EndConfApply =
 		    fun() ->
 			    timetrap(TVal),
-			    case catch apply(Mod,end_per_testcase,[Func,Conf]) of
+			    case catch apply(Mod,
+					     end_per_testcase,
+					     [Func,Conf]) of
 				{'EXIT',Why} ->
 				    timer:sleep(1),
 				    group_leader() ! {printout,12,
@@ -775,7 +778,9 @@ spawn_fw_call(Mod,{init_per_testcase,Func},CurrConf,Pid,
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
-		case catch do_end_tc_call(Mod,Func, {Pid,Skip,[CurrConf]}, Why) of
+		case catch do_end_tc_call(Mod,Func,
+					  {Pid,Skip,[CurrConf]},
+					  Why) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
 		    _ ->
@@ -942,12 +947,15 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf]},
 					   {fail,Reason}),
 		{{0,NewResult},Where,[]};
-	    Skip = {skip,_Reason} ->
-		NewResult = do_end_tc_call(Mod,Func, {Skip,Args0}, Skip),
+	    Skip = {SkipType,_Reason} when SkipType == skip;
+					   SkipType == skipped ->
+		NewResult = do_end_tc_call(Mod,Func,
+					   {Skip,Args0}, Skip),
 		{{0,NewResult},Where,[]};
 	    AutoSkip = {auto_skip,_Reason} ->
 		%% special case where a conf case "pretends" to be skipped
-		NewResult = do_end_tc_call(Mod,Func, {AutoSkip,Args0}, AutoSkip),
+		NewResult =
+		    do_end_tc_call(Mod,Func, {AutoSkip,Args0}, AutoSkip),
 		{{0,NewResult},Where,[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
@@ -958,10 +966,12 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 	    set_tc_state(init_per_testcase, hd(Args)),
 	    ensure_timetrap(Args),
 	    case init_per_testcase(Mod, Func, Args) of
-		Skip = {skip,Reason} ->
+		Skip = {SkipType,Reason} when SkipType == skip;
+					      SkipType == skipped ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}}|hd(Args)],
-		    NewRes = do_end_tc_call(Mod,Func, {Skip,[Conf]}, Skip),
+		    NewRes = do_end_tc_call(Mod,Func,
+					    {Skip,[Conf]}, Skip),
 		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
@@ -979,11 +989,12 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    {{0,NewRes},[{Mod,Func}],[]};
 		{ok,NewConf} ->
 		    %% call user callback function if defined
-		    NewConf1 = user_callback(TCCallback, Mod, Func, init, NewConf),
+		    NewConf1 =
+			user_callback(TCCallback, Mod, Func, init, NewConf),
 		    %% save current state in controller loop
 		    set_tc_state(tc, NewConf1),
 		    %% execute the test case
-		    {{T,Return},Loc} = {ts_tc(Mod, Func, [NewConf1]),get_loc()},
+		    {{T,Return},Loc} = {ts_tc(Mod,Func,[NewConf1]), get_loc()},
 		    {EndConf,TSReturn,FWReturn} =
 			case Return of
 			    {E,TCError} when E=='EXIT' ; E==failed ->
@@ -999,30 +1010,39 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 				{[{tc_status,{skipped,Why}},
 				  {save_config,SaveCfg}|NewConf1],
 				 Skip,Skip};
-			    {skip,Why} ->
-				{[{tc_status,{skipped,Why}}|NewConf1],Return,Return};
+			    {SkipType,Why} when SkipType == skip;
+						SkipType == skipped ->
+				{[{tc_status,{skipped,Why}}|NewConf1],Return,
+				 Return};
 			    _ ->
 				{[{tc_status,ok}|NewConf1],Return,ok}
 			end,
 		    %% call user callback function if defined
-		    EndConf1 = user_callback(TCCallback, Mod, Func, 'end', EndConf),
+		    EndConf1 =
+			user_callback(TCCallback, Mod, Func, 'end', EndConf),
 		    %% update current state in controller loop
 		    {FWReturn1,TSReturn1,EndConf2} =
 			case end_per_testcase(Mod, Func, EndConf1) of
 			    SaveCfg1={save_config,_} ->
-				{FWReturn,TSReturn,[SaveCfg1|lists:keydelete(save_config,1,
-									     EndConf1)]};
+				{FWReturn,TSReturn,
+				 [SaveCfg1|lists:keydelete(save_config,1,
+							   EndConf1)]};
 			    {fail,ReasonToFail} ->
 				%% user has failed the testcase
-				fw_error_notify(Mod, Func, EndConf1, ReasonToFail),
-				{{error,ReasonToFail},{failed,ReasonToFail},EndConf1};
-			    {failed,{_,end_per_testcase,_}} = Failure when FWReturn == ok ->
+				fw_error_notify(Mod, Func, EndConf1,
+						ReasonToFail),
+				{{error,ReasonToFail},
+				 {failed,ReasonToFail},
+				 EndConf1};
+			    {failed,{_,end_per_testcase,_}} = Failure when
+				  FWReturn == ok ->
 				%% unexpected termination in end_per_testcase
 				%% report this as the result to the framework
 				{Failure,TSReturn,EndConf1};
 			    _ ->
-				%% test case result should be reported to framework
-				%% no matter the status of end_per_testcase
+				%% test case result should be reported to
+				%% framework no matter the status of
+				%% end_per_testcase
 				{FWReturn,TSReturn,EndConf1}
 			end,
 		    %% clear current state in controller loop
@@ -1089,7 +1109,8 @@ process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
     ReturnTags = [skip,skip_and_save,save_config,comment,return_group_result],
     %% check if all elements in the list are valid end conf return value tuples
     case lists:all(fun(Val) when is_tuple(Val) ->
-			   lists:any(fun(T) -> T == element(1, Val) end, ReturnTags);
+			   lists:any(fun(T) -> T == element(1, Val) end,
+				     ReturnTags);
 		      (ok) ->
 			   true;
 		      (_) ->
@@ -1123,14 +1144,19 @@ process_return_val1([Failed={E,TCError}|_], M,F,A=[Args], Loc, _, SaveOpts)
 	NewReturn ->
 	    {NewReturn,SaveOpts}
     end;
-process_return_val1([SaveCfg={save_config,_}|Opts], M,F,[Args], Loc, Final, SaveOpts) ->
+process_return_val1([SaveCfg={save_config,_}|Opts], M,F,[Args],
+		    Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,[[SaveCfg|Args]], Loc, Final, SaveOpts);
-process_return_val1([{skip_and_save,Why,SaveCfg}|Opts], M,F,[Args], Loc, _, SaveOpts) ->
-    process_return_val1(Opts, M,F,[[{save_config,SaveCfg}|Args]], Loc, {skip,Why}, SaveOpts);
-process_return_val1([GR={return_group_result,_}|Opts], M,F,A, Loc, Final, SaveOpts) ->
+process_return_val1([{skip_and_save,Why,SaveCfg}|Opts], M,F,[Args],
+		    Loc, _, SaveOpts) ->
+    process_return_val1(Opts, M,F,[[{save_config,SaveCfg}|Args]],
+			Loc, {skip,Why}, SaveOpts);
+process_return_val1([GR={return_group_result,_}|Opts], M,F,A,
+		    Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, [GR|SaveOpts]);
-process_return_val1([RetVal={Tag,_}|Opts], M,F,A, Loc, _, SaveOpts) when Tag==skip;
-									 Tag==comment ->
+process_return_val1([RetVal={Tag,_}|Opts], M,F,A,
+		    Loc, _, SaveOpts) when Tag==skip;
+					   Tag==comment ->
     process_return_val1(Opts, M,F,A, Loc, RetVal, SaveOpts);
 process_return_val1([_|Opts], M,F,A, Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, SaveOpts);
@@ -1144,7 +1170,8 @@ process_return_val1([], M,F,A, _Loc, Final, SaveOpts) ->
 
 user_callback(undefined, _, _, _, Args) ->
     Args;
-user_callback({CBMod,CBFunc}, Mod, Func, InitOrEnd, [Args]) when is_list(Args) ->
+user_callback({CBMod,CBFunc}, Mod, Func, InitOrEnd,
+	      [Args]) when is_list(Args) ->
     case catch apply(CBMod, CBFunc, [InitOrEnd,Mod,Func,Args]) of
 	Args1 when is_list(Args1) ->
 	    [Args1];
@@ -1736,7 +1763,8 @@ timetrap(Timeout0, TimeToReport0, TCPid, MultAndScale = {Multiplier,Scale}) ->
 	    put(test_server_timetraps,[{Handle,TCPid,{TimeToReport,Scale}}]);
 	List ->
 	    List1 = lists:delete({infinity,TCPid,{infinity,false}}, List),
-	    put(test_server_timetraps,[{Handle,TCPid,{TimeToReport,Scale}}|List1])
+	    put(test_server_timetraps,[{Handle,TCPid,
+					{TimeToReport,Scale}}|List1])
     end,
     Handle.
 
@@ -1795,7 +1823,9 @@ time_ms(Ms, _, _) when is_integer(Ms) -> Ms;
 time_ms(infinity, _, _) -> infinity;
 time_ms(Fun, TCPid, MultAndScale) when is_function(Fun) ->
     time_ms_apply(Fun, TCPid, MultAndScale);
-time_ms({M,F,A}=MFA, TCPid, MultAndScale) when is_atom(M), is_atom(F), is_list(A) ->
+time_ms({M,F,A}=MFA, TCPid, MultAndScale) when is_atom(M),
+					       is_atom(F),
+					       is_list(A) ->
     time_ms_apply(MFA, TCPid, MultAndScale);
 time_ms(Other, _, _) -> exit({invalid_time_format,Other}).