diff options
| author | Hans Nilsson <[email protected]> | 2016-06-09 12:09:52 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-09 12:09:52 +0200 |
| commit | 060807cf9e91182b4d46432c436a8c4953be9d7d (patch) | |
| tree | 26107721553ec67ec247c20da123233b6a4db1a1 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | 38cdb3b5131257a8cc76b8f64e32b8ecf722bdb4 (diff) | |
| parent | 2f1ee6efa802f7f1089add9f87fd8b2804d5f124 (diff) | |
| download | otp-060807cf9e91182b4d46432c436a8c4953be9d7d.tar.gz otp-060807cf9e91182b4d46432c436a8c4953be9d7d.tar.bz2 otp-060807cf9e91182b4d46432c436a8c4953be9d7d.zip | |
Merge branch 'hans/ssh/update_tests/OTP-13573'
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 4a69fd36b3..52a26110c4 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -28,6 +28,7 @@ -include_lib("kernel/include/file.hrl"). -include("ssh_xfer.hrl"). -include("ssh.hrl"). +-include("ssh_test_lib.hrl"). -define(USER, "Alladin"). -define(PASSWD, "Sesame"). @@ -72,14 +73,17 @@ groups() -> %%-------------------------------------------------------------------- init_per_suite(Config) -> - DataDir = proplists:get_value(data_dir, Config), - PrivDir = proplists:get_value(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(proplists:get_value(priv_dir, Config), nopubkey), - file:make_dir(UserDir), - Config. + ?CHECK_CRYPTO( + begin + DataDir = proplists:get_value(data_dir, Config), + PrivDir = proplists:get_value(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(proplists:get_value(priv_dir, Config), nopubkey), + file:make_dir(UserDir), + Config + end). end_per_suite(Config) -> SysDir = proplists:get_value(priv_dir, Config), |