diff options
| author | Hans Nilsson <[email protected]> | 2018-03-02 11:46:08 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-03-02 11:46:08 +0100 |
| commit | 79f8a5dfff65f06b8975e1765f52ee6a04d85001 (patch) | |
| tree | 0ae9ce4c24df7fee555e0ac1e4f069fe9d141f5c /lib/ssh/test/ssh_test_lib.erl | |
| parent | cae492cdf842addf31cd43956278f98efe4e2443 (diff) | |
| parent | 21fcf565b190efd0174bd2e7005ed98797c8c026 (diff) | |
| download | otp-79f8a5dfff65f06b8975e1765f52ee6a04d85001.tar.gz otp-79f8a5dfff65f06b8975e1765f52ee6a04d85001.tar.bz2 otp-79f8a5dfff65f06b8975e1765f52ee6a04d85001.zip | |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: Extend ssh_basic_SUITE:packet_size_zero to ...:packet_size Also got rid of some EXIT messages due to ssh_connection:shell/2 being async and ssh:close came too soon
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index f97c3b1352..57ae2dbac2 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -53,10 +53,12 @@ daemon(Host, Options) -> daemon(Host, Port, Options) -> - %% ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]), + ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]), case ssh:daemon(Host, Port, Options) of {ok, Pid} -> - {ok,L} = ssh:daemon_info(Pid), + R = ssh:daemon_info(Pid), + ct:log("~p:~p ssh:daemon_info(~p) ->~n ~p",[?MODULE,?LINE,Pid,R]), + {ok,L} = R, ListenPort = proplists:get_value(port, L), ListenIP = proplists:get_value(ip, L), {Pid, ListenIP, ListenPort}; |