aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_connection_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-02-23 16:31:39 +0100
committerHans Nilsson <[email protected]>2016-02-23 16:31:39 +0100
commit739a8f167d8adbb85f3c116c8c3bb20263f15349 (patch)
tree2931ad62890be30d26126be1dc2052b583c16e04 /lib/ssh/test/ssh_connection_SUITE.erl
parentbd5c928e1c47f05d0d7b18f4e28e42d276cfc038 (diff)
parentfaa11910e0214ba05747ca8579e14efa421e3d02 (diff)
downloadotp-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_connection_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_connection_SUITE.erl15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 1b93cc9c32..67d870bea4 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -36,6 +36,9 @@
%% suite() ->
%% [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{timetrap,{minutes,5}}].
+
all() ->
[
{group, openssh},
@@ -67,16 +70,10 @@ ptty() ->
%%--------------------------------------------------------------------
init_per_suite(Config) ->
- catch crypto:stop(),
- case catch crypto:start() of
- ok ->
- Config;
- _Else ->
- {skip, "Crypto could not be started!"}
- end.
+ Config.
-end_per_suite(_Config) ->
- crypto:stop().
+end_per_suite(Config) ->
+ Config.
%%--------------------------------------------------------------------
init_per_group(openssh, Config) ->