File 2396-ssh-add-msg-traceing-on-one-testcase.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2396-ssh-add-msg-traceing-on-one-testcase.patch of Package erlang

From dfb0fed48117669bd69fd44d37fa83f264f5ca36 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 20 Apr 2017 20:47:13 +0200
Subject: [PATCH 2/2] ssh: add msg traceing on one testcase

ssh: Misc test case error logging improvments

Conflicts:
	lib/ssh/test/ssh_to_openssh_SUITE.erl
---
 lib/ssh/test/ssh_relay.erl            |  4 ++--
 lib/ssh/test/ssh_test_lib.erl         |  5 +++--
 lib/ssh/test/ssh_to_openssh_SUITE.erl | 25 +++++++++++++++----------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/ssh/test/ssh_relay.erl b/lib/ssh/test/ssh_relay.erl
index 1e3810e9d..763130358 100644
--- a/lib/ssh/test/ssh_relay.erl
+++ b/lib/ssh/test/ssh_relay.erl
@@ -242,11 +242,11 @@ handle_info(stop, State) ->
     {stop, normal, State};
 
 handle_info({'DOWN', _Ref, _process, LPid, Reason}, S) when S#state.lpid == LPid ->
-    io:format("Acceptor has finished: ~p~n", [Reason]),
+    io:format("Acceptor in ~p has finished: ~p~n", [?MODULE,Reason]),
     {noreply, S};
 
 handle_info(_Info, State) ->
-    io:format("Unhandled info: ~p~n", [_Info]),
+    io:format("~p:~p Unhandled info: ~p~n", [?MODULE,?LINE,_Info]),
     {noreply, State}.
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 35e3ee3ed..6b3055eba 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -153,7 +153,7 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     IO = ssh_test_lib:start_io_server(),
     Shell = ssh_test_lib:start_shell(?SSH_DEFAULT_PORT, IO),
     IO ! {input, self(), "echo Hej\n"},
-    receive_data("Hej"),
+    receive_data("Hej", undefined),
     IO ! {input, self(), "exit\n"},
     receive_logout(),
     receive_normal_exit(Shell).
@@ -451,7 +451,6 @@ erlang_server_openssh_client_renegotiate(Config) ->
 %%--------------------------------------------------------------------
 erlang_client_openssh_server_renegotiate(_Config) ->
     process_flag(trap_exit, true),
-
     IO = ssh_test_lib:start_io_server(),
     Ref = make_ref(),
     Parent = self(),
@@ -487,11 +486,11 @@ erlang_client_openssh_server_renegotiate(_Config) ->
 	    ct:fail("Error=~p",[Error]);
 	{ok, Ref, ConnectionRef} ->
 	    IO ! {input, self(), "echo Hej1\n"},
-	    receive_data("Hej1"),
+	    receive_data("Hej1", ConnectionRef),
 	    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
 	    ssh_connection_handler:renegotiate(ConnectionRef),
 	    IO ! {input, self(), "echo Hej2\n"},
-	    receive_data("Hej2"),
+	    receive_data("Hej2", ConnectionRef),
 	    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
 	    IO ! {input, self(), "exit\n"},
 	    receive_logout(),
@@ -554,23 +553,29 @@ erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config)
 %%--------------------------------------------------------------------
 %%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
-receive_data(Data) ->
+receive_data(Data, Conn) ->
     receive
 	Info when is_binary(Info) ->
 	    Lines = string:tokens(binary_to_list(Info), "\r\n "),
 	    case lists:member(Data, Lines) of
 		true ->
-		    ct:log("Expected result found in lines: ~p~n", [Lines]),
+		    ct:log("Expected result ~p found in lines: ~p~n", [Data,Lines]),
 		    ok;
 		false ->
 		    ct:log("Extra info: ~p~n", [Info]),
-		    receive_data(Data)
+		    receive_data(Data, Conn)
 	    end;
 	Other ->
 	    ct:log("Unexpected: ~p",[Other]),
-	    receive_data(Data)
-    after 
-	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
+	    receive_data(Data, Conn)
+    after
+	30000 ->
+             {State, _} = case Conn of
+                              undefined -> {'??','??'};
+                              _ -> sys:get_state(Conn)
+                          end,
+            ct:log("timeout ~p:~p~nExpect ~p~nState = ~p",[?MODULE,?LINE,Data,State]),
+            ct:fail("timeout ~p:~p",[?MODULE,?LINE])
     end.	
 
 receive_logout() ->
-- 
2.12.2

Places

File 2396-ssh-add-msg-traceing-on-one-testcase.patch of Package erlang

Places