From 0ff06d3941ce4487f18f11dde66dd6c28068e833 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 9 Feb 2016 13:53:23 +0100
Subject: ssh: remove some spurions test printouts

---
 lib/ssh/test/ssh_algorithms_SUITE.erl |  9 +++++++--
 lib/ssh/test/ssh_basic_SUITE.erl      | 11 +++++++++--
 lib/ssh/test/ssh_test_lib.erl         |  9 ++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index f0ac92fef6..a0f1edd5fb 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -231,8 +231,11 @@ sshc_simple_exec(Config) ->
 			" ",Host," 1+1."]),
     ct:log("~p",[Cmd]),
     SshPort = open_port({spawn, Cmd}, [binary]),
+    Expect = <<"2\n">>,
     receive
-        {SshPort,{data, <<"2\n">>}} ->
+	{SshPort, {data,Expect}} ->
+	    ct:log("Got expected ~p from ~p",[Expect,SshPort]),
+	    port_close(SshPort),
 	    ok
     after ?TIMEOUT ->
 	    ct:fail("Did not receive answer")
@@ -273,7 +276,9 @@ sshd_simple_exec(_Config) ->
 					     ConnectionRef, ChannelId1);
 	Other1 ->
 	    ct:fail(Other1)
-    end.
+    end,
+    ssh:close(ConnectionRef).
+
 
 %%%================================================================
 %%%
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 4b53f6ec57..642e7a82a2 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -441,6 +441,7 @@ exec(Config) when is_list(Config) ->
 	    ct:fail(Other1)
     end,
     ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1),
+    ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
@@ -474,6 +475,7 @@ exec_compressed(Config) when is_list(Config) ->
 		    ct:fail(Other)
 	    end,
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
+	    ssh:close(ConnectionRef),
 	    ssh:stop_daemon(Pid)
     end.
 
@@ -979,7 +981,10 @@ shell_no_unicode(Config) ->
     new_do_shell(?config(io,Config),
 		 [new_prompt,
 		  {type,"io:format(\"hej ~p~n\",[42])."},
-		  {expect,"hej 42"}
+		  {expect,"hej 42"},
+		  {expect,"ok"},
+		  new_prompt,
+		  {type,"exit()."}
 		 ]).
 	      
 %%--------------------------------------------------------------------
@@ -988,7 +993,9 @@ shell_unicode_string(Config) ->
 		 [new_prompt,
 		  {type,"io:format(\"こにちわ~ts~n\",[\"四二\"])."},
 		  {expect,"こにちわ四二"},
-		  {expect,"ok"}
+		  {expect,"ok"},
+		  new_prompt,
+		  {type,"exit()."}
 		 ]).
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 2db55b97b4..5f91fb627a 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -120,7 +120,8 @@ std_simple_exec(Host, Port, Config, Opts) ->
 	Other ->
 	    ct:fail(Other)
     end,
-    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId).
+    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
+    ssh:close(ConnectionRef).
 
 
 start_shell(Port, IOServer, UserDir) ->
@@ -154,14 +155,12 @@ loop_io_server(TestCase, Buff0) ->
 	 {input, TestCase, Line} ->
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
 	 {io_request, From, ReplyAs, Request} ->
-%%ct:log("~p",[{io_request, From, ReplyAs, Request}]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
-%%ct:log("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
-	 {'EXIT',_, _} ->
-	     erlang:display('ssh_test_lib:loop_io_server/2 EXIT'),
+	 {'EXIT',_, _} = _Exit ->
+%%	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
 	     ok
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
-- 
cgit v1.2.3