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_to_openssh_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_to_openssh_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 67a61d3c11..37885dfdef 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -33,6 +33,9 @@ %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- +suite() -> + [{timetrap,{minutes,5}}]. + all() -> case os:find_executable("ssh") of false -> @@ -57,21 +60,14 @@ groups() -> ]. init_per_suite(Config) -> - catch crypto:stop(), - case catch crypto:start() of - ok -> - case gen_tcp:connect("localhost", 22, []) of - {error,econnrefused} -> - {skip,"No openssh deamon"}; - _ -> - ssh_test_lib:openssh_sanity_check(Config) - end; - _Else -> - {skip,"Could not start crypto!"} + case gen_tcp:connect("localhost", 22, []) of + {error,econnrefused} -> + {skip,"No openssh deamon"}; + _ -> + ssh_test_lib:openssh_sanity_check(Config) end. end_per_suite(_Config) -> - crypto:stop(), ok. init_per_group(erlang_server, Config) -> |