From 8626ba1bf825899ffad119aca5ae126176b0b6d3 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 16 Feb 2016 12:07:05 +0100
Subject: ssh: add timetrap to all test suites

---
 lib/ssh/test/ssh_upgrade_SUITE.erl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/ssh/test/ssh_upgrade_SUITE.erl')

diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index 85f4d36258..1a2a8de08c 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -38,6 +38,9 @@
 %%%
 %%% CommonTest callbacks
 %%% 
+suite() ->
+    [{timetrap,{minutes,5}}].
+
 all() -> 
     [
      minor_upgrade,
-- 
cgit v1.2.3


From 0f54fc85b91b5ad244534238aeab5c0bc5f93815 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 17 Feb 2016 13:40:42 +0100
Subject: ssh: remove calls to crypto:start|stop

Conflicts:
	lib/ssh/test/ssh_upgrade_SUITE.erl
---
 lib/ssh/test/ssh_upgrade_SUITE.erl | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'lib/ssh/test/ssh_upgrade_SUITE.erl')

diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index 1a2a8de08c..006483d3ee 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -48,27 +48,17 @@ all() ->
     ].
 
 init_per_suite(Config0) ->
-    catch crypto:stop(),
-    try {crypto:start(), erlang:system_info({wordsize, internal}) == 
-                 	     erlang:system_info({wordsize, external})} of
-	{ok, true} ->
-	    case ct_release_test:init(Config0) of
-		{skip, Reason} ->
-		    {skip, Reason};
-		Config ->
-		    ssh:start(),
-		    Config
-	    end;
-	{ok, false} ->
-	    {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} 
-    catch _:_ ->
-	    {skip, "Crypto did not start"}
+    case ct_release_test:init(Config0) of
+	{skip, Reason} ->
+	    {skip, Reason};
+	Config ->
+	    ssh:start(),
+	    Config
     end.
 
 end_per_suite(Config) ->
     ct_release_test:cleanup(Config),
     ssh:stop(),
-    crypto:stop(),
     UserDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_rsa(UserDir).
 
-- 
cgit v1.2.3