Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/r16/OTP-11453' into bmk/snmp/snmp425_integration

Conflicts:
	lib/snmp/src/misc/snmp_log.erl

4 files changed, 35 insertions, 24 deletions

diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 4ee7e48a67..8fed341600 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -34,13 +34,15 @@
 %% Event handler Callbacks
 -export([init/1,
 	 handle_event/2, handle_call/2, handle_info/2,
-	 terminate/1]).
+	 terminate/1, terminate/2, code_change/3]).
 
 %% Other
 -export([handle_remote_events/1]).
 
 -include("ct.hrl").
 
+-behaviour(gen_event).
+
 -record(eh_state, {log_func,
 		   curr_suite,
 		   curr_group,
@@ -184,10 +186,13 @@ handle_call({handle_remote_events,Bool}, State) ->
 handle_call(_Query, _State) ->
     {error, bad_query}.
 
-terminate(_State) ->
+terminate(_) ->
     error_logger:delete_report_handler(?MODULE),
     [].
 
+terminate(_Arg, _State) ->
+    ok.
+
 tag_event(Event) ->
     {calendar:local_time(), Event}.
 
@@ -236,3 +241,6 @@ format_header(#eh_state{curr_suite = Suite,
 			curr_func = TC}) ->
     io_lib:format("System report during ~w:~w/1 in ~w",
 		  [Suite,TC,Group]).
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover
index 3aa49623e7..87d00c420f 100644
--- a/lib/common_test/test/common_test.cover
+++ b/lib/common_test/test/common_test.cover
@@ -4,7 +4,6 @@
 				  test_server,
 				  test_server_ctrl,
 				  test_server_gl,
-				  test_server_h,
 				  test_server_io,
 				  test_server_node,
 				  test_server_sup]}]}.
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
index 84341a0b99..5de1ecc2bd 100644
--- a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
@@ -89,28 +89,31 @@ pre_post_io(Config) ->
     %%!--------------------------------------------------------------------
 
     spawn(fun() ->
+		  ct:pal("CONTROLLER: Started!", []),
 		  %% --- test run 1 ---
-		  ct:sleep(3000),
-		  ct_test_support:ct_rpc({cth_log_redirect,
-					  handle_remote_events,
-					  [true]}, Config),
-		  ct:sleep(2000),
-		  io:format(user, "Starting test run!~n", []),
-		  ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
-		  ct:sleep(6000),
-		  io:format(user, "Finishing off!~n", []),
-		  ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  timer:sleep(3000),
+		  ct:pal("CONTROLLER: Handle remote events = true", []),
+		  ok = ct_test_support:ct_rpc({cth_log_redirect,
+					       handle_remote_events,
+					       [true]}, Config),
+		  timer:sleep(2000),
+		  ct:pal("CONTROLLER: Proceeding with test run #1!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  timer:sleep(6000),
+		  ct:pal("CONTROLLER: Proceeding with shutdown #1!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
 		  %% --- test run 2 ---
-		  ct:sleep(3000),
-		  ct_test_support:ct_rpc({cth_log_redirect,
-					  handle_remote_events,
-					  [true]}, Config),
-		  ct:sleep(2000),
-		  io:format(user, "Starting test run!~n", []),
-		  ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
-		  ct:sleep(6000),
-		  io:format(user, "Finishing off!~n", []),
-		  ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config)
+		  timer:sleep(3000),
+		  ct:pal("CONTROLLER: Handle remote events = true", []),
+		  ok = ct_test_support:ct_rpc({cth_log_redirect,
+					       handle_remote_events,
+					       [true]}, Config),
+		  timer:sleep(2000),
+		  ct:pal("CONTROLLER: Proceeding with test run #2!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  timer:sleep(6000),
+		  ct:pal("CONTROLLER: Proceeding with shutdown #2!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config)
 	  end),
     ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
index c8c08a5735..2ba991fc61 100644
--- a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
@@ -28,7 +28,8 @@
 %%%===================================================================
 
 proceed() ->
-    ?MODULE ! proceed.
+    ?MODULE ! proceed,
+    ok.
 
 %%--------------------------------------------------------------------
 %% Hook functions