diff options
| author | Hans Nilsson <[email protected]> | 2016-02-23 16:33:12 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-02-23 16:33:12 +0100 |
| commit | ae6677714f4f8f1684e9d95997be68930d263d64 (patch) | |
| tree | 8f0040e5f345a5057f4645cc58f6d9d2b9f97e74 /lib/ssh/test/ssh_test_lib.erl | |
| parent | 1f1d0b942b950a5a2bec67a3110c85721db9cb5c (diff) | |
| parent | 739a8f167d8adbb85f3c116c8c3bb20263f15349 (diff) | |
| download | otp-ae6677714f4f8f1684e9d95997be68930d263d64.tar.gz otp-ae6677714f4f8f1684e9d95997be68930d263d64.tar.bz2 otp-ae6677714f4f8f1684e9d95997be68930d263d64.zip | |
Merge branch 'maint'
Conflicts:
lib/ssh/test/ssh_upgrade_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 9 |
1 files changed, 4 insertions, 5 deletions
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]) |