Fix remaining issues

3 files changed, 31 insertions, 18 deletions

diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 8326705575..53cfbd7118 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -728,23 +728,25 @@ test_events(lib_error) ->
       {lib_error_1_SUITE,no_lines_throw,{failed,{error,{thrown,catch_me_if_u_can}}}}},
      {?eh,test_stats,{0,8,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_error}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_error,ok}},
-     {?eh,test_stats,{1,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,
+         {framework_error,{{badmatch,[1,2]},'_'}}}},
+     {?eh,test_stats,{0,9,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_exit}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_exit,ok}},
-     {?eh,test_stats,{2,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,{framework_error,byebye}}},
+     {?eh,test_stats,{0,10,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_throw}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_throw,ok}},
-     {?eh,test_stats,{3,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,{framework_error,catch_me_if_u_can}}},
+     {?eh,test_stats,{0,11,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_error}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_error,ok}},
-     {?eh,test_stats,{3,9,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,
+		   {framework_error,{{badmatch,[1,2]},'_'}}}},
+     {?eh,test_stats,{0,12,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_exit}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_exit,ok}},
-     {?eh,test_stats,{3,10,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,{framework_error,byebye}}},
+     {?eh,test_stats,{0,13,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_throw}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_throw,ok}},
-     {?eh,test_stats,{3,11,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,{framework_error,catch_me_if_u_can}}},
+     {?eh,test_stats,{0,14,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_per_suite}},
      {?eh,tc_done,{lib_error_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
index 658c7e8232..6f1b391ae6 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
@@ -152,23 +152,32 @@ no_lines_throw(_) ->
     lib_no_lines:do_throw(),
     ok.
 
-init_tc_error(_) ->
+init_tc_error() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_error(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
 
-init_tc_exit(_) ->
+init_tc_error(_) ->
+    ok.
+
+init_tc_exit() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_exit(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
 
-init_tc_throw(_) ->
+init_tc_exit(_) ->
+    ok.
+
+init_tc_throw() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_throw(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
+
+init_tc_throw(_) ->
+    ok.
 
 end_tc_error(_) ->
     put('$test_server_framework_test',
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index f00b2bbb43..8353f5936c 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -324,6 +324,8 @@ test_events(one_empty_cth) ->
 
      {?eh,tc_start,{ct_cth_empty_SUITE,test_case}},
      {?eh,cth,{empty_cth,pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_testcase,[test_case,'$proplist','_',[]]}},
+     {?eh,cth,{empty_cth,pre_end_per_testcase,[test_case,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_end_per_testcase,[test_case,'$proplist','_',[]]}},
      {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},