diff options
| author | Hans Nilsson <[email protected]> | 2016-02-17 13:40:42 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-02-22 11:58:12 +0100 |
| commit | 0f54fc85b91b5ad244534238aeab5c0bc5f93815 (patch) | |
| tree | b51d804bc41f061225b401f7d648b4bd8125aed3 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | 8626ba1bf825899ffad119aca5ae126176b0b6d3 (diff) | |
| download | otp-0f54fc85b91b5ad244534238aeab5c0bc5f93815.tar.gz otp-0f54fc85b91b5ad244534238aeab5c0bc5f93815.tar.bz2 otp-0f54fc85b91b5ad244534238aeab5c0bc5f93815.zip | |
ssh: remove calls to crypto:start|stop
Conflicts:
lib/ssh/test/ssh_upgrade_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 60fe34a152..687f327206 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -72,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(). %%-------------------------------------------------------------------- |