diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-11-29 14:59:13 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-11-29 14:59:13 +0100 |
| commit | 19c560d98202b87e5b158f673fd48ba347e623ee (patch) | |
| tree | 1b3eb6265cb82f372afbc5c52590c6316b3425a3 | |
| parent | b66486468476734419ec4e3aa9cbac766aa012fe (diff) | |
| download | otp-19c560d98202b87e5b158f673fd48ba347e623ee.tar.gz otp-19c560d98202b87e5b158f673fd48ba347e623ee.tar.bz2 otp-19c560d98202b87e5b158f673fd48ba347e623ee.zip | |
Removed unused code ssh.erl and changed tests
| -rw-r--r-- | lib/ssh/src/ssh.erl | 4 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index e089dd20bd..719c97e940 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -364,8 +364,6 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); -handle_option([{sftpd_vsn, _} = Opt | Rest], SocketOptions, SshOptions) -> - handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); handle_option([Opt | Rest], SocketOptions, SshOptions) -> handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions). @@ -442,8 +440,6 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true; Opt; handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 -> Opt; -handle_ssh_option({sftpd_vsn, Value} = Opt) when is_integer(Value), Value =:= 6 -> - Opt; handle_ssh_option(Opt) -> throw({error, {eoptions, Opt}}). diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 2f81e89433..5aa46872ee 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -348,7 +348,7 @@ mk_rm_dir(Config) when is_list(Config) -> _/binary>>, _} = mkdir(DirName, Cm, Channel, ReqId), NewReqId = 1, - {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FAILURE), + {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FILE_ALREADY_EXISTS), _/binary>>, _} = mkdir(DirName, Cm, Channel, NewReqId), NewReqId1 = 2, diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl index c2cea76953..8f722941d4 100644 --- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl @@ -270,9 +270,9 @@ ver6_basic(doc) -> ["Test some version 6 features"]; ver6_basic(Config) when is_list(Config) -> PrivDir = ?config(priv_dir, Config), - NewDir = filename:join(PrivDir, "testdir"), + NewDir = filename:join(PrivDir, "testdir2"), {Sftp, _} = ?config(sftp, Config), - %ok = ssh_sftp:make_dir(Sftp, NewDir), + ok = ssh_sftp:make_dir(Sftp, NewDir), %%Test file_is_a_directory {error, file_is_a_directory} = ssh_sftp:delete(Sftp, NewDir). %%-------------------------------------------------------------------- |