Correct tests cases that fail because of modified events

1 files changed, 85 insertions, 17 deletions

diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index 6f6ff754aa..f7cdc90a4d 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -164,7 +164,7 @@ test_events(auto_skip) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{11,11,34}},
+     {?eh,start_info,{12,12,43}},
 
      {?eh,tc_start,{auto_skip_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -384,26 +384,26 @@ test_events(auto_skip) ->
 
      {?eh,tc_start,{auto_skip_10_SUITE,init_per_suite}},
      {?eh,tc_done,{auto_skip_10_SUITE,init_per_suite,
-		   {failed,{error,
-			    {require_failed_in_suite0,
-			     {not_available,undefined_config_variable}}}}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,tc1,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+		   {auto_skipped,{require_failed_in_suite0,
+				  {not_available,undefined_config_variable}}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,tc1,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
      {?eh,test_stats,{9,0,{0,21}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,tc2,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,tc2,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
      {?eh,test_stats,{9,0,{0,22}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,end_per_suite,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,end_per_suite,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
 
      {?eh,tc_start,{auto_skip_11_SUITE,init_per_suite}},
      {?eh,tc_done,{auto_skip_11_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{auto_skip_11_SUITE,tc1}},
      {?eh,tc_done,{auto_skip_11_SUITE,tc1,
-		   {skipped,{require_failed,{not_available,undefined_config_variable}}}}},
+		   {auto_skipped,{require_failed,
+				  {not_available,undefined_config_variable}}}}},
      {?eh,test_stats,{9,0,{0,23}}},
      {?eh,tc_start,{auto_skip_11_SUITE,tc2}},
      {?eh,tc_done,{auto_skip_11_SUITE,tc2,ok}},
@@ -422,7 +422,8 @@ test_events(auto_skip) ->
 	 {?eh,tc_start,{auto_skip_11_SUITE,tc3}},
 	 {?eh,tc_done,
 	  {auto_skip_11_SUITE,tc3,
-	   {skipped,{require_failed,{not_available,undefined_config_variable}}}}},
+	   {auto_skipped,{require_failed,
+			  {not_available,undefined_config_variable}}}}},
 	 {?eh,test_stats,{10,0,{0,24}}},
 	 {?eh,tc_start,
 	  {auto_skip_11_SUITE,{end_per_group,g2,[parallel]}}},
@@ -435,8 +436,75 @@ test_events(auto_skip) ->
 
      {?eh,tc_start,{auto_skip_11_SUITE,end_per_suite}},
      {?eh,tc_done,{auto_skip_11_SUITE,end_per_suite,ok}},
-
-     %%! HERE: auto_skip_12_SUITE terms!!
+     
+     {?eh,tc_start,{auto_skip_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{auto_skip_12_SUITE,init_per_suite,ok}},
+
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,
+				  [{suite,auto_skip_12_SUITE}]},
+		    {auto_skipped,
+		     {require_failed,{not_available,unknown_variable_g1}}}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,25}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,26}}},
+      {?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,
+			 {require_failed,{not_available,unknown_variable_g1}}}}],
+     
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,
+				  [{suite,auto_skip_12_SUITE}]},
+		    {auto_skipped,
+		     {require_failed,{not_available,unknown_variable_g1}}}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,28}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,29}}},
+      {?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,
+			 {require_failed,{not_available,unknown_variable_g1}}}}],
+
+     [{?eh,tc_start,{ct_framework,{init_per_group,g3,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g3,
+				  [{suite,auto_skip_12_SUITE}]},ok}},
+      {?eh,tc_start,{auto_skip_12_SUITE,tc1}},
+      {?eh,tc_done,{auto_skip_12_SUITE,tc1,ok}},
+      {?eh,test_stats,{11,0,{0,30}}},
+      {?eh,tc_start,{auto_skip_12_SUITE,tc2}},
+      {?eh,tc_done,{auto_skip_12_SUITE,tc2,ok}},
+      {?eh,test_stats,{12,0,{0,30}}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g4,
+				    [{suite,auto_skip_12_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g4,
+				   [{suite,auto_skip_12_SUITE}]},
+		     {auto_skipped,
+		      {require_failed,{not_available,unknown_variable_g4}}}}},
+       {?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,
+			  {require_failed,{not_available,unknown_variable_g4}}}}],
+
+      {?eh,tc_start,{ct_framework,{end_per_group,g3,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g3,
+				  [{suite,auto_skip_12_SUITE}]},ok}}],
+
+     {?eh,tc_start,{auto_skip_12_SUITE,end_per_suite}},
+     {?eh,tc_done,{auto_skip_12_SUITE,end_per_suite,ok}},
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}