aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-03-01 17:06:51 +0100
committerHans Nilsson <[email protected]>2017-03-01 17:06:51 +0100
commit8b16a74976ce36f869fd9662b30973bf7a56ea97 (patch)
tree5ccda714853488c5e6245c779e05f2e7d0f8197d
parent719cf362f7aae411f78330ca97b720366cb295b8 (diff)
parent48b477e9c232bc1573fa34960781ee2a509e3e46 (diff)
downloadotp-8b16a74976ce36f869fd9662b30973bf7a56ea97.tar.gz
otp-8b16a74976ce36f869fd9662b30973bf7a56ea97.tar.bz2
otp-8b16a74976ce36f869fd9662b30973bf7a56ea97.zip
Merge branch 'maint'
-rw-r--r--lib/ssh/test/ssh_algorithms_SUITE.erl3
-rw-r--r--lib/ssh/test/ssh_to_openssh_SUITE.erl1
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 313b7fc559..6f75d83c4a 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -200,6 +200,9 @@ try_exec_simple_group(Group, Config) ->
%%--------------------------------------------------------------------
%% Testing all default groups
+simple_exec_groups() ->
+ [{timetrap,{seconds,120}}].
+
simple_exec_groups(Config) ->
Sizes = interpolate( public_key:dh_gex_group_sizes() ),
lists:foreach(
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 4d5e5be2a1..cd5ba6ecd2 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -464,6 +464,7 @@ erlang_client_openssh_server_renegotiate(_Config) ->
{silently_accept_hosts,true}],
group_leader(IO, self()),
{ok, ConnRef} = ssh:connect(Host, ?SSH_DEFAULT_PORT, Options),
+ ct:pal("Parent = ~p, IO = ~p, Shell = ~p, ConnRef = ~p~n",[Parent, IO, self(), ConnRef]),
case ssh_connection:session_channel(ConnRef, infinity) of
{ok,ChannelId} ->
success = ssh_connection:ptty_alloc(ConnRef, ChannelId, []),