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_erlclient_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_erlclient_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl index 91404e222f..84410f60e6 100644 --- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl @@ -55,29 +55,22 @@ groups() -> init_per_suite(Config) -> catch ssh:stop(), - catch crypto:stop(), - case catch crypto:start() of - ok -> - DataDir = ?config(data_dir, Config), - PrivDir = ?config(priv_dir, Config), - FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"), - c:c(FileAlt), - FileName = filename:join(DataDir, "test.txt"), - {ok, FileInfo} = file:read_file_info(FileName), - ok = file:write_file_info(FileName, - FileInfo#file_info{mode = 8#400}), - ssh_test_lib:setup_dsa(DataDir, PrivDir), - Config; - _Else -> - {skip,"Could not start ssh!"} - end. + DataDir = ?config(data_dir, Config), + PrivDir = ?config(priv_dir, Config), + FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"), + c:c(FileAlt), + FileName = filename:join(DataDir, "test.txt"), + {ok, FileInfo} = file:read_file_info(FileName), + ok = file:write_file_info(FileName, + FileInfo#file_info{mode = 8#400}), + ssh_test_lib:setup_dsa(DataDir, PrivDir), + Config. end_per_suite(Config) -> UserDir = filename:join(?config(priv_dir, Config), nopubkey), file:del_dir(UserDir), SysDir = ?config(priv_dir, Config), ssh_test_lib:clean_dsa(SysDir), - crypto:stop(), ok. %%-------------------------------------------------------------------- |