diff options
| author | Niclas Eklund <[email protected]> | 2011-05-16 15:25:03 +0200 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-05-19 14:38:24 +0200 |
| commit | 26e3b024571952284e026a4f8d3ef55777dc4386 (patch) | |
| tree | 71e7130b2aee10195a9a5831e696695b82806430 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | 2fb636273a06d31f0c24dcecf9302cd6561f02af (diff) | |
| download | otp-26e3b024571952284e026a4f8d3ef55777dc4386.tar.gz otp-26e3b024571952284e026a4f8d3ef55777dc4386.tar.bz2 otp-26e3b024571952284e026a4f8d3ef55777dc4386.zip | |
Generic key management for test suites.
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 97857c98d9..bfe54a3e75 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -55,7 +55,7 @@ init_per_suite(Config) -> case {catch ssh:stop(),catch crypto:start()} of {ok,ok} -> - ssh_test_lib:make_dsa_public_key_file(42, 43, 44, 45, Config), + ssh_test_lib:make_dsa_files(Config), Config; {ok,_} -> {skip,"Could not start ssh!"}; @@ -94,11 +94,16 @@ init_per_testcase(TestCase, Config) -> SysDir = ?config(data_dir, Config), {ok, Sftpd} = ssh_sftpd:listen(?SFPD_PORT, [{system_dir, SysDir}, - {user_passwords,[{?USER, ?PASSWD}]}]), + {user_passwords,[{?USER, ?PASSWD}]}, + {pwdfun, fun(_,_) -> true end}]), Cm = ssh_test_lib:connect(?SFPD_PORT, - [{silently_accept_hosts, true}, - {user, ?USER}, {password, ?PASSWD}]), + [{system_dir, SysDir}, + {user_dir, SysDir}, + {user, ?USER}, {password, ?PASSWD}, + {user_interaction, false}, + {silently_accept_hosts, true}, + {pwdfun, fun(_,_) -> true end}]), {ok, Channel} = ssh_connection:session_channel(Cm, ?XFER_WINDOW_SIZE, ?XFER_PACKET_SIZE, ?TIMEOUT), |