diff options
| author | Hans Nilsson <[email protected]> | 2016-02-23 16:33:12 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-02-23 16:33:12 +0100 |
| commit | ae6677714f4f8f1684e9d95997be68930d263d64 (patch) | |
| tree | 8f0040e5f345a5057f4645cc58f6d9d2b9f97e74 /lib/ssh/test/ssh_sftp_SUITE.erl | |
| parent | 1f1d0b942b950a5a2bec67a3110c85721db9cb5c (diff) | |
| parent | 739a8f167d8adbb85f3c116c8c3bb20263f15349 (diff) | |
| download | otp-ae6677714f4f8f1684e9d95997be68930d263d64.tar.gz otp-ae6677714f4f8f1684e9d95997be68930d263d64.tar.bz2 otp-ae6677714f4f8f1684e9d95997be68930d263d64.zip | |
Merge branch 'maint'
Conflicts:
lib/ssh/test/ssh_upgrade_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_sftp_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftp_SUITE.erl | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index 698af259c8..6066221fc7 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -35,7 +35,9 @@ %%-------------------------------------------------------------------- suite() -> - [{ct_hooks,[ts_install_cth]}]. + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,5}}]. + all() -> [{group, not_unicode}, @@ -44,22 +46,14 @@ all() -> init_per_suite(Config) -> - catch crypto:stop(), - case (catch crypto:start()) of - ok -> - ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p", - [file:native_name_encoding(),io:getopts()]), - ssh:start(), - Config; - _ -> - {skip,"Could not start crypto!"} - end. - -end_per_suite(Config) -> - ssh:stop(), - crypto:stop(), + ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p", + [file:native_name_encoding(),io:getopts()]), + ssh:start(), Config. +end_per_suite(_onfig) -> + ssh:stop(). + %%-------------------------------------------------------------------- groups() -> [{not_unicode, [], [{group,erlang_server}, |