Make it possible to fail test case by returning {fail,Reason} from init_per_testcase.

2 files changed, 25 insertions, 15 deletions

diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index e9cf0eead9..c4ad2934ae 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -242,7 +242,7 @@ test_events(cfg_error) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{14,14,42}},
+     {?eh,start_info,{14,14,43}},
 
      {?eh,tc_start,{cfg_error_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -523,16 +523,19 @@ test_events(cfg_error) ->
      %%! end_tc failes the testcase
      {?eh,tc_done,{cfg_error_9_SUITE,tc6,ok}},
      {?eh,test_stats,{9,2,{0,18}}},
+     {?eh,tc_start,{cfg_error_9_SUITE,tc7}},
+     {?eh,tc_done,{cfg_error_9_SUITE,tc7,{failed,{error,tc7_should_be_failed}}}},
+     {ct_test_support_eh,test_stats,{9,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc11}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc11,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
 			    {'EXIT',warning_should_be_printed}}}}},
-     {?eh,test_stats,{10,2,{0,18}}},
+     {?eh,test_stats,{10,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc12}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc12,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
 			    {timetrap_timeout,2000}}}}},
-     {?eh,test_stats,{11,2,{0,18}}},
+     {?eh,test_stats,{11,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc13}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc13,
 		   {failed,{cfg_error_9_SUITE,end_per_testcase,
@@ -542,11 +545,11 @@ test_events(cfg_error) ->
 				      {test_server,do_end_per_testcase,4},
 				      {test_server,run_test_case_eval1,6},
 				      {test_server,run_test_case_eval,8}]}}}}}},
-     {?eh,test_stats,{12,2,{0,18}}},
+     {?eh,test_stats,{12,3,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc14}},
      {?eh,tc_done,
       {cfg_error_9_SUITE,tc14,{failed,{error,tc14_should_be_failed}}}},
-     {?eh,test_stats,{12,3,{0,18}}},
+     {?eh,test_stats,{12,4,{0,18}}},
 
      {?eh,tc_start,{cfg_error_9_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_9_SUITE,end_per_suite,ok}},
@@ -557,7 +560,7 @@ test_events(cfg_error) ->
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,tc1,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
-     {?eh,test_stats,{12,3,{0,19}}},
+     {?eh,test_stats,{12,4,{0,19}}},
      {?eh,tc_auto_skip,{cfg_error_10_SUITE,end_per_suite,
 			{failed,{cfg_error_10_SUITE,init_per_suite,
 				 {failed,fail_init_per_suite}}}}},
@@ -566,40 +569,40 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_11_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc1,
 		   {skipped,{config_name_already_in_use,[dummy0]}}}},
-     {?eh,test_stats,{12,3,{1,19}}},
+     {?eh,test_stats,{12,4,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc2,ok}},
-     {?eh,test_stats,{13,3,{1,19}}},
+     {?eh,test_stats,{13,4,{1,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
-     {?eh,test_stats,{13,4,{1,19}}},
+     {?eh,test_stats,{13,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc2,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{14,4,{1,19}}},
+     {?eh,test_stats,{14,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
-     {?eh,test_stats,{15,4,{1,19}}},
+     {?eh,test_stats,{15,5,{1,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc4}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc4,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{16,4,{1,19}}},
+     {?eh,test_stats,{16,5,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_13_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_13_SUITE,tc1,ok}},
-     {?eh,test_stats,{17,4,{1,19}}},
+     {?eh,test_stats,{17,5,{1,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_14_SUITE,tc1,ok}},
-     {?eh,test_stats,{18,4,{1,19}}},
+     {?eh,test_stats,{18,5,{1,19}}},
      {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
 		   {comment,
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
index d73287ad62..40b7d2da47 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_9_SUITE.erl
@@ -83,6 +83,8 @@ init_per_testcase(tc3, Config) ->
     Config;
 init_per_testcase(tc4, _) ->
     ok;
+init_per_testcase(tc7, _) ->
+    {fail,tc7_should_be_failed};
 init_per_testcase(_, Config) ->
     Config.
 
@@ -136,7 +138,7 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() -> 
-    [tc1,tc2,tc3,tc4,tc5,tc6,
+    [tc1,tc2,tc3,tc4,tc5,tc6,tc7,
      tc11,tc12,tc13,tc14].
 
 tc1(_) ->
@@ -171,6 +173,11 @@ tc6(_) ->
     ct:comment("This one should succeed but then get failed by end_tc!"),
     fini.
 
+tc7(_) ->
+    ct:comment("This one should get failed by iptc!"),
+    fini.
+
+
 tc11(_) ->
     fini.
 tc12(_) ->