Merge branch 'maint'

4 files changed, 39 insertions, 7 deletions

diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index bf27238121..d7bd18606b 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -64,10 +64,16 @@ do_open_files([],Acc) ->
 handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
     {ok, State};
 handle_event({_Type,_GL,{Pid,{ct_connection,Action,ConnName},Report}},State) ->
+    %% NOTE: if the format of this event is changed
+    %% ({ct_connection,Action,ConnName}) then remember to change
+    %% test_server_h:report_receiver as well!!!
     Info = conn_info(Pid,#conn_log{name=ConnName,action=Action}),
     write_report(now(),Info,Report,State),
     {ok, State};
 handle_event({_Type,_GL,{Pid,Info=#conn_log{},Report}},State) ->
+    %% NOTE: if the format of this event is changed
+    %% (Info=#conn_log{}) then remember to change
+    %% test_server_h:report_receiver as well!!!
     write_report(now(),conn_info(Pid,Info),Report,State),
     {ok, State};
 handle_event({error_report,_,{Pid,_,[{ct_connection,ConnName}|R]}},State) ->
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 52fe9599ce..294b82bff6 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -968,7 +968,7 @@ close_session(Client) ->
 %% @end
 %%----------------------------------------------------------------------
 close_session(Client, Timeout) ->
-    call(Client,{send_rpc_op, close_session, [], Timeout}).
+    call(Client,{send_rpc_op, close_session, [], Timeout}, true).
 
 
 %%----------------------------------------------------------------------
@@ -1121,17 +1121,38 @@ close(Client) ->
 %% Internal functions
 %%----------------------------------------------------------------------
 call(Client, Msg) ->
-    call(Client, Msg, infinity).
-call(Client, Msg, Timeout) ->
+    call(Client, Msg, infinity, false).
+call(Client, Msg, Timeout) when is_integer(Timeout); Timeout==infinity ->
+    call(Client, Msg, Timeout, false);
+call(Client, Msg, WaitStop) when is_boolean(WaitStop) ->
+    call(Client, Msg, infinity, WaitStop).
+call(Client, Msg, Timeout, WaitStop) ->
     case get_handle(Client) of
 	{ok,Pid} ->
 	    case ct_gen_conn:call(Pid,Msg,Timeout) of
-		{error,{process_down,Client,noproc}} ->
+		{error,{process_down,Pid,noproc}} ->
 		    {error,no_such_client};
-		{error,{process_down,Client,normal}} ->
+		{error,{process_down,Pid,normal}} when WaitStop ->
+		    %% This will happen when server closes connection
+		    %% before clien received rpc-reply on
+		    %% close-session.
+		    ok;
+		{error,{process_down,Pid,normal}} ->
 		    {error,closed};
-		{error,{process_down,Client,Reason}} ->
+		{error,{process_down,Pid,Reason}} ->
 		    {error,{closed,Reason}};
+		Other when WaitStop ->
+		    MRef = erlang:monitor(process,Pid),
+		    receive
+			{'DOWN',MRef,process,Pid,Normal} when Normal==normal;
+							      Normal==noproc ->
+			    Other;
+			{'DOWN',MRef,process,Pid,Reason} ->
+			    {error,{{closed,Reason},Other}}
+		    after Timeout ->
+			    erlang:demonitor(MRef, [flush]),
+			    {error,{timeout,Other}}
+		    end;
 		Other ->
 		    Other
 	    end;
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 30084a6228..3042a924fe 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -113,7 +113,7 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
-events_to_check(Test,Config) ->
+events_to_check(default,Config) ->
     {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
 					     netconfc1_SUITE)),
     TCs = netconfc1_SUITE:all(),
diff --git a/lib/test_server/src/test_server_h.erl b/lib/test_server/src/test_server_h.erl
index fdeee59326..78daba855d 100644
--- a/lib/test_server/src/test_server_h.erl
+++ b/lib/test_server/src/test_server_h.erl
@@ -131,6 +131,11 @@ report_receiver(warning_msg, _) -> kernel;
 report_receiver(warning_report, _) -> kernel;
 report_receiver(info, _) -> kernel;
 report_receiver(info_msg, _) -> kernel;
+report_receiver(info_report,Tuple)
+  when is_tuple(Tuple) andalso
+       (element(1,Tuple)==ct_connection orelse
+	element(1,Tuple)==conn_log) ->
+    none;
 report_receiver(info_report, _) -> kernel;
 report_receiver(_, _) -> none.