aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-26 09:48:04 +0200
committerHans Nilsson <[email protected]>2018-04-26 09:48:04 +0200
commited4a3e682c28b6bfda7008f627f1bf3e748ba211 (patch)
tree42bbf86cd8640854843c1828a5caa755eac1e7e3 /lib/ssh
parente7b44e3002c65fd2444c29fce0df890b936cfb73 (diff)
parentaf8340ee003ec8c7d4d185e4df4252c6df39cbbc (diff)
downloadotp-ed4a3e682c28b6bfda7008f627f1bf3e748ba211.tar.gz
otp-ed4a3e682c28b6bfda7008f627f1bf3e748ba211.tar.bz2
otp-ed4a3e682c28b6bfda7008f627f1bf3e748ba211.zip
Merge branch 'hans/ssh/cuddle_tests'
* hans/ssh/cuddle_tests: ssh: Better logging in test case
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/test/ssh_options_SUITE.erl10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 12a85c40aa..86a8ac5aa8 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -1227,7 +1227,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
[_|_] = Connections,
%% Now try one more than alowed:
- ct:log("Info Report might come here...",[]),
+ ct:pal("Info Report expected here (if not disabled) ...",[]),
try Connect(Host,Port)
of
_ConnectionRef1 ->
@@ -1235,8 +1235,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
{fail,"Too many connections accepted"}
catch
error:{badmatch,{error,"Connection closed"}} ->
- %% Step 2 ok: could not set up max_sessions+1 connections
- %% This is expected
+ ct:log("Step 2 ok: could not set up too many connections. Good.",[]),
%% Now stop one connection and try to open one more
ok = ssh:close(hd(Connections)),
try_to_connect(Connect, Host, Port, Pid)
@@ -1249,16 +1248,15 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
try_to_connect(Connect, Host, Port, Pid) ->
- {ok,Tref} = timer:send_after(3000, timeout_no_connection), % give the supervisors some time...
+ {ok,Tref} = timer:send_after(30000, timeout_no_connection), % give the supervisors some time...
try_to_connect(Connect, Host, Port, Pid, Tref, 1). % will take max 3300 ms after 11 tries
try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
try Connect(Host,Port)
of
_ConnectionRef1 ->
- %% Step 3 ok: could set up one more connection after killing one
- %% Thats good.
timer:cancel(Tref),
+ ct:log("Step 3 ok: could set up one more connection after killing one. Thats good.",[]),
ssh:stop_daemon(Pid),
receive % flush.
timeout_no_connection -> ok