diff options
| author | Hans Nilsson <[email protected]> | 2016-02-23 16:31:39 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-02-23 16:31:39 +0100 |
| commit | 739a8f167d8adbb85f3c116c8c3bb20263f15349 (patch) | |
| tree | 2931ad62890be30d26126be1dc2052b583c16e04 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | bd5c928e1c47f05d0d7b18f4e28e42d276cfc038 (diff) | |
| parent | faa11910e0214ba05747ca8579e14efa421e3d02 (diff) | |
| download | otp-739a8f167d8adbb85f3c116c8c3bb20263f15349.tar.gz otp-739a8f167d8adbb85f3c116c8c3bb20263f15349.tar.bz2 otp-739a8f167d8adbb85f3c116c8c3bb20263f15349.zip | |
Merge branch 'hans/ssh/maint_cuddle_tests' into maint
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 6b03a2b763..687f327206 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -44,6 +44,9 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- +suite() -> + [{timetrap,{minutes,5}}]. + all() -> [open_close_file, open_close_dir, @@ -69,28 +72,21 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - catch crypto:stop(), - case (catch crypto:start()) of - ok -> - DataDir = ?config(data_dir, Config), - PrivDir = ?config(priv_dir, Config), - ssh_test_lib:setup_dsa(DataDir, PrivDir), - %% to make sure we don't use public-key-auth - %% this should be tested by other test suites - UserDir = filename:join(?config(priv_dir, Config), nopubkey), - file:make_dir(UserDir), - Config; - _ -> - {skip,"Could not start crypto!"} - end. + DataDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), + ssh_test_lib:setup_dsa(DataDir, PrivDir), + %% to make sure we don't use public-key-auth + %% this should be tested by other test suites + UserDir = filename:join(?config(priv_dir, Config), nopubkey), + file:make_dir(UserDir), + Config. end_per_suite(Config) -> SysDir = ?config(priv_dir, Config), ssh_test_lib:clean_dsa(SysDir), UserDir = filename:join(?config(priv_dir, Config), nopubkey), file:del_dir(UserDir), - ssh:stop(), - crypto:stop(). + ssh:stop(). %%-------------------------------------------------------------------- |