diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-01-10 17:37:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-01-11 15:04:56 +0100 |
| commit | b75d8ba523acfe1a0b23aec6211da1f2d5fd2c42 (patch) | |
| tree | a3b0957465dba753e0b19332ef8802a20f25226a /lib/ssh/test/ssh_sftp_SUITE.erl | |
| parent | 4d24c6be73d8c73cccd4780e819f0a5148b6f717 (diff) | |
| download | otp-b75d8ba523acfe1a0b23aec6211da1f2d5fd2c42.tar.gz otp-b75d8ba523acfe1a0b23aec6211da1f2d5fd2c42.tar.bz2 otp-b75d8ba523acfe1a0b23aec6211da1f2d5fd2c42.zip | |
Improve test case structure so that test should pass on all platforms
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}, |