diff options
| author | Hans Nilsson <[email protected]> | 2017-03-01 18:27:27 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-03-01 18:27:27 +0100 |
| commit | bf737f7a5f335ebbbd6f9c2062ae78ca644572f9 (patch) | |
| tree | f98d99d70437647897395c2d9a6d0357b36670c4 /lib/ssh | |
| parent | 48d5cc98890fc2052cceff1625d4284958cf6276 (diff) | |
| parent | cba9c49ee26a848a8dac7971b4c8edf39f9f0bf0 (diff) | |
| download | otp-bf737f7a5f335ebbbd6f9c2062ae78ca644572f9.tar.gz otp-bf737f7a5f335ebbbd6f9c2062ae78ca644572f9.tar.bz2 otp-bf737f7a5f335ebbbd6f9c2062ae78ca644572f9.zip | |
Merge branch 'hans/ssh/cuddle_tests_maint' into maint
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 1 |
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 b6f4a7371d..0b9b7acde8 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, []), |