aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Eklund <nick@erlang.org>2011-05-18 13:58:04 +0200
committerNiclas Eklund <nick@erlang.org>2011-05-19 14:38:25 +0200
commit358af31ec75e32046e44645c6b6d511062e46393 (patch)
tree964fd772aee9c27460042f7e3fa5396628fca1f0
parent26e3b024571952284e026a4f8d3ef55777dc4386 (diff)
downloadotp-358af31ec75e32046e44645c6b6d511062e46393.tar.gz
otp-358af31ec75e32046e44645c6b6d511062e46393.tar.bz2
otp-358af31ec75e32046e44645c6b6d511062e46393.zip
Removed unused record and fixed a few failing test cases,
-rw-r--r--lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl17
-rw-r--r--lib/ssh/test/ssh_test_lib.erl9
2 files changed, 16 insertions, 10 deletions
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index ebed8c0b54..2209af05d5 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -94,7 +94,9 @@ init_per_testcase(TestCase, Config) ->
ssh_sftpd:subsystem_spec([{file_handler,
ssh_sftpd_file_alt}]),
[{user_passwords,[{?USER, ?PASSWD}]},
+ {pwdfun, fun(_,_) -> true end},
{system_dir, DataDir},
+ {user_dir, DataDir},
{subsystems, [Spec]}];
"root_dir" ->
Privdir = ?config(priv_dir, Config),
@@ -102,17 +104,23 @@ init_per_testcase(TestCase, Config) ->
file:make_dir(Root),
Spec = ssh_sftpd:subsystem_spec([{root,Root}]),
[{user_passwords,[{?USER, ?PASSWD}]},
+ {pwdfun, fun(_,_) -> true end},
{system_dir, DataDir},
+ {user_dir, DataDir},
{subsystems, [Spec]}];
"list_dir_limited" ->
Spec =
ssh_sftpd:subsystem_spec([{max_files,1}]),
[{user_passwords,[{?USER, ?PASSWD}]},
+ {pwdfun, fun(_,_) -> true end},
{system_dir, DataDir},
+ {user_dir, DataDir},
{subsystems, [Spec]}];
_ ->
[{user_passwords,[{?USER, ?PASSWD}]},
+ {pwdfun, fun(_,_) -> true end},
+ {user_dir, DataDir},
{system_dir, DataDir}]
end,
@@ -121,7 +129,11 @@ init_per_testcase(TestCase, Config) ->
{ok, ChannelPid, Connection} =
ssh_sftp:start_channel(Host, ?SSHD_PORT,
[{silently_accept_hosts, true},
- {user, ?USER}, {password, ?PASSWD}, {timeout, 30000}]),
+ {user, ?USER}, {password, ?PASSWD},
+ {pwdfun, fun(_,_) -> true end},
+ {system_dir, DataDir},
+ {user_dir, DataDir},
+ {timeout, 30000}]),
TmpConfig = lists:keydelete(sftp, 1, Config),
NewConfig = lists:keydelete(sftpd, 1, TmpConfig),
[{sftp, {ChannelPid, Connection}}, {sftpd, Sftpd} | NewConfig].
@@ -216,6 +228,9 @@ quit_OTP_6349(Config) when is_list(Config) ->
timer:sleep(5000),
{ok, NewSftp, _Conn} = ssh_sftp:start_channel(Host, ?SSHD_PORT,
[{silently_accept_hosts, true},
+ {pwdfun, fun(_,_) -> true end},
+ {system_dir, DataDir},
+ {user_dir, DataDir},
{user, ?USER}, {password, ?PASSWD}]),
{ok, <<_/binary>>} = ssh_sftp:read_file(NewSftp, FileName),
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index b11ebc1652..425fae22c1 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -30,15 +30,6 @@
-define(TIMEOUT, 50000).
-
--record(ssh_key,
- {
- type,
- public,
- private,
- comment = ""
- }).
-
connect(Options) ->
connect(hostname(), inet_port(), Options).