diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-02 14:14:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-10 15:34:27 +0100 |
| commit | 647ef86cd72d5646eda0901f59a68e3bd4878a9f (patch) | |
| tree | 816ef0725e4ca7075a004b5663f253660b44ce82 /lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | |
| parent | 8d20de278b3ef69ea470bfb35e5999750214e3a1 (diff) | |
| download | otp-647ef86cd72d5646eda0901f59a68e3bd4878a9f.tar.gz otp-647ef86cd72d5646eda0901f59a68e3bd4878a9f.tar.bz2 otp-647ef86cd72d5646eda0901f59a68e3bd4878a9f.zip | |
Ssh daemon handles RSA host keys
Solves OTP-7677
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl index ca189d4b02..4c469ed5f7 100644 --- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl @@ -90,7 +90,7 @@ end_per_suite(Config) -> init_per_testcase(TestCase, Config) -> ssh:start(), PrivDir = ?config(priv_dir, Config), - DataDir = ?config(data_dir, Config), + SystemDir = filename:join(PrivDir, system), Options = case atom_to_list(TestCase) of @@ -98,7 +98,7 @@ init_per_testcase(TestCase, Config) -> Spec = ssh_sftpd:subsystem_spec([{file_handler, ssh_sftpd_file_alt}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; "root_dir" -> @@ -106,19 +106,19 @@ init_per_testcase(TestCase, Config) -> Root = filename:join(Privdir, root), file:make_dir(Root), Spec = ssh_sftpd:subsystem_spec([{root,Root}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; "list_dir_limited" -> Spec = ssh_sftpd:subsystem_spec([{max_files,1}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; _ -> [{user_dir, PrivDir}, - {system_dir, DataDir}] + {system_dir, SystemDir}] end, {Sftpd, Host, Port} = ssh_test_lib:daemon(Options), |