diff options
| author | Hans Nilsson <[email protected]> | 2014-12-09 12:03:54 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-12-09 12:03:54 +0100 |
| commit | d84b59736cc90b287672b49369969d3f106622bf (patch) | |
| tree | 5f8790598d0711dbd0439fa703f582a3b3f483d5 /lib/ssh | |
| parent | fc3ff2f4c1e742f9f625cd3c5900992863643a49 (diff) | |
| parent | 0abb0fd12196bec78cbab63fe2a22b000b283279 (diff) | |
| download | otp-d84b59736cc90b287672b49369969d3f106622bf.tar.gz otp-d84b59736cc90b287672b49369969d3f106622bf.tar.bz2 otp-d84b59736cc90b287672b49369969d3f106622bf.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_connection_SUITE.erl | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index 553d0f5720..85bd2c75d4 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -37,7 +37,7 @@ all() -> [ {group, openssh}, - start_subsystem_on_closed_channel, + {group, openssh_payload}, interrupted_send, start_shell, start_shell_exec, @@ -286,32 +286,7 @@ ptty_alloc_pixel(Config) when is_list(Config) -> ssh:close(ConnectionRef). %%-------------------------------------------------------------------- -start_subsystem_on_closed_channel(Config) -> - PrivDir = ?config(priv_dir, Config), - UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth - file:make_dir(UserDir), - SysDir = ?config(data_dir, Config), - {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir}, - {user_dir, UserDir}, - {password, "morot"}, - {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]), - - ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true}, - {user, "foo"}, - {password, "morot"}, - {user_interaction, false}, - {user_dir, UserDir}]), - - {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity), - - ok = ssh_connection:close(ConnectionRef, ChannelId), - failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity), - - ssh:close(ConnectionRef), - ssh:stop_daemon(Pid). - -%%-------------------------------------------------------------------- interrupted_send() -> [{doc, "Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."}]. |