Modify the auto_skip report for group config funcs to include group name

Also correct failing test cases and find and fix remaining bugs.

1 files changed, 24 insertions, 19 deletions

diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index 5f88ac4825..b0a6c839a2 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -282,8 +282,9 @@ test_events(auto_skip) ->
 				       {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,7}}},
       {?eh,tc_auto_skip,
-       {auto_skip_5_SUITE,end_per_group,{failed,{auto_skip_5_SUITE,init_per_group,
-						 {'EXIT',{group,g1,failed}}}}}}],
+       {auto_skip_5_SUITE,{end_per_group,g1},
+	{failed,{auto_skip_5_SUITE,init_per_group,
+		 {'EXIT',{group,g1,failed}}}}}}],
 
      {?eh,tc_start,{auto_skip_5_SUITE,end_per_suite}},
      {?eh,tc_done,{auto_skip_5_SUITE,end_per_suite,ok}},
@@ -310,8 +311,9 @@ test_events(auto_skip) ->
 				       {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,11}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,end_per_group,{failed,{auto_skip_6_SUITE,init_per_group,
-						 {'EXIT',{group,g1,failed}}}}}}],
+       {auto_skip_6_SUITE,{end_per_group,g1},
+	{failed,{auto_skip_6_SUITE,init_per_group,
+		 {'EXIT',{group,g1,failed}}}}}}],
 
      [{?eh,tc_start,{auto_skip_6_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,{auto_skip_6_SUITE,{init_per_group,g3,[]},ok}},
@@ -330,8 +332,9 @@ test_events(auto_skip) ->
 					{'EXIT',{group,g4,failed}}}}}},
        {?eh,test_stats,{3,0,{0,13}}},
        {?eh,tc_auto_skip,
-	{auto_skip_6_SUITE,end_per_group,{failed,{auto_skip_6_SUITE,init_per_group,
-						  {'EXIT',{group,g4,failed}}}}}}],
+	{auto_skip_6_SUITE,{end_per_group,g4},
+	 {failed,{auto_skip_6_SUITE,init_per_group,
+		  {'EXIT',{group,g4,failed}}}}}}],
       {?eh,tc_start,{auto_skip_6_SUITE,tc2}},
       {?eh,tc_done,{auto_skip_6_SUITE,tc2,ok}},
       {?eh,test_stats,{4,0,{0,13}}},
@@ -504,7 +507,7 @@ test_events(auto_skip) ->
       {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,27}}},
-      {?eh,tc_auto_skip,{ct_framework,end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}}],
      
      [{?eh,tc_start,{ct_framework,{init_per_group,g1,
@@ -522,7 +525,7 @@ test_events(auto_skip) ->
       {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,30}}},
-      {?eh,tc_auto_skip,{ct_framework,end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}}],
 
      [{?eh,tc_start,{ct_framework,{init_per_group,g3,
@@ -544,7 +547,7 @@ test_events(auto_skip) ->
        {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
 			  {require_failed,{not_available,unknown_variable_g4}}}},
        {?eh,test_stats,{12,0,{0,31}}},
-       {?eh,tc_auto_skip,{ct_framework,end_per_group,
+       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g4},
 			  {require_failed,{not_available,unknown_variable_g4}}}}],
 
       {?eh,tc_start,{ct_framework,{end_per_group,g3,
@@ -639,7 +642,7 @@ test_events(user_skip) ->
       {?eh,test_stats,{3,0,{10,0}}},
       {?eh,tc_user_skip,{user_skip_4_SUITE,tc2,"Group skipped"}},
       {?eh,test_stats,{3,0,{11,0}}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g1},"Group skipped"}}],
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g2,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g2,[]},ok}},
@@ -659,7 +662,7 @@ test_events(user_skip) ->
       {?eh,tc_user_skip,{user_skip_4_SUITE,tc7,"Group skipped"}},
       {?eh,tc_user_skip,{user_skip_4_SUITE,tc8,"Group skipped"}},
       {?eh,test_stats,{5,0,{15,0}}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g3},"Group skipped"}}],
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g5,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g5,[]},ok}},
@@ -672,7 +675,7 @@ test_events(user_skip) ->
        {?eh,test_stats,{6,0,{16,0}}},
        {?eh,tc_user_skip,{user_skip_4_SUITE,tc11,"Group skipped"}},
        {?eh,test_stats,{6,0,{17,0}}},
-       {?eh,tc_user_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+       {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g6},"Group skipped"}}],
        {?eh,tc_start,{user_skip_4_SUITE,{end_per_group,g5,[]}}},
        {?eh,tc_done,{user_skip_4_SUITE,{end_per_group,g5,[]},ok}}],
 
@@ -701,7 +704,8 @@ test_events(user_skip) ->
        {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Top group skipped"}},
        {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Top group skipped"}},
        {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,end_per_group,"Top group skipped"}}]},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,ptop1},
+			  "Top group skipped"}}]},
       
      {parallel,
       [{?eh,tc_start,{user_skip_6_SUITE,{init_per_group,ptop2,[parallel]}}},
@@ -716,7 +720,8 @@ test_events(user_skip) ->
 		       {skipped,"Sub group skipped"}}},
 	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Sub group skipped"}},
 	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Sub group skipped"}},
-	 {?eh,tc_user_skip,{user_skip_6_SUITE,end_per_group,"Sub group skipped"}}]},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,psub2},
+			    "Sub group skipped"}}]},
        
        {?eh,tc_start,{user_skip_6_SUITE,tc2}},
        {?eh,tc_done,{user_skip_6_SUITE,tc2,ok}},
@@ -772,7 +777,7 @@ test_events(testspec_skip) ->
      {?eh,start_info,{1,1,4}},
      {?eh,tc_start,{ct_framework,init_per_suite}},
      {?eh,tc_done,{ct_framework,init_per_suite,ok}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,init_per_group,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{init_per_group,ptop1},"SKIPPED"}},
      {?eh,tc_user_skip,{user_skip_7_SUITE,tc1,"SKIPPED"}},
      {?eh,test_stats,{0,0,{1,0}}},
      {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
@@ -781,7 +786,7 @@ test_events(testspec_skip) ->
      {?eh,test_stats,{0,0,{3,0}}},
      {?eh,tc_user_skip,{user_skip_7_SUITE,tc2,"SKIPPED"}},
      {?eh,test_stats,{0,0,{4,0}}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,end_per_group,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,ptop1},"SKIPPED"}},
      {?eh,tc_start,{ct_framework,end_per_suite}},
      {?eh,tc_done,{ct_framework,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
@@ -798,11 +803,11 @@ test_events(testspec_skip) ->
        {?eh,tc_done,
 	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]},ok}},
        {?eh,tc_user_skip,
-	{user_skip_7_SUITE,init_per_group,"SKIPPED"}},
+	{user_skip_7_SUITE,{init_per_group,psub1},"SKIPPED"}},
        {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
        {?eh,tc_user_skip,{user_skip_7_SUITE,tc4,"SKIPPED"}},
        {?eh,test_stats,{0,0,{2,0}}},
-       {?eh,tc_user_skip,{user_skip_7_SUITE,end_per_group,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,psub1},"SKIPPED"}},
        {?eh,tc_start,{user_skip_7_SUITE,tc1}},
        {?eh,tc_done,{user_skip_7_SUITE,tc1,ok}},
        {?eh,tc_start,{user_skip_7_SUITE,tc2}},
@@ -841,7 +846,7 @@ test_events(testspec_skip) ->
        {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
        {?eh,test_stats,{0,0,{4,0}}},
        {?eh,tc_user_skip,
-	{user_skip_6_SUITE,end_per_group,"Top group skipped"}}]},
+	{user_skip_6_SUITE,{end_per_group,ptop1},"Top group skipped"}}]},
      {?eh,tc_start,{ct_framework,end_per_suite}},
      {?eh,tc_done,{ct_framework,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},