diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-01-16 11:43:15 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-01-16 11:43:15 +0100 |
| commit | f8815dc88bd86d6508d2a3dad031ea939fb2b443 (patch) | |
| tree | 6db7476dddc9a21566d144ee722b676d938646ff /lib/ssh/test/ssh_sftp_SUITE.erl | |
| parent | 27d478f37930d147aaac62a1353e071ca17fbbcc (diff) | |
| parent | b89c0042c4839ae8ebb231640f3e66ee52de3aa7 (diff) | |
| download | otp-f8815dc88bd86d6508d2a3dad031ea939fb2b443.tar.gz otp-f8815dc88bd86d6508d2a3dad031ea939fb2b443.tar.bz2 otp-f8815dc88bd86d6508d2a3dad031ea939fb2b443.zip | |
Merge branch 'ia/ssh/test-maint' into maint
* ia/ssh/test-maint:
Remove generation of new test keys, use checked in test keys
Improve test case structure so that test should pass on all platforms
Exec test case should ignore stderr messages
Do not run ssh_to_openssh_SUITE if there is no oppenssh server running
Diffstat (limited to 'lib/ssh/test/ssh_sftp_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftp_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index c96b6de3ea..a9a568ced6 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -50,7 +50,6 @@ init_per_suite(Config) -> {ok,ok} -> Dir = ?config(priv_dir, Config), {ok, _} = ssh_test_lib:get_id_keys(Dir), - ssh_test_lib:make_dsa_files(Config), Config; {ok,_} -> {skip,"Could not start ssh!"}; @@ -94,13 +93,14 @@ init_per_testcase(_Case, Config) -> SysDir = ?config(data_dir, Config), Host = ssh_test_lib:hostname(), + %% Run test against openssh server if available Sftp = case (catch ssh_sftp:start_channel(Host, [{user_dir, Dir}, {user_interaction, false}, {silently_accept_hosts, true}])) of {ok, ChannelPid, Connection} -> {ChannelPid, Connection}; - _Error -> + _Error -> %% Start own sftp server {_Sftpd, _Host, _Port} = ssh_test_lib:daemon(Host, ?SFPD_PORT, [{system_dir, SysDir}, |