Merge branch 'ingela/ssl/test-cuddle' into maint

* ingela/ssl/test-cuddle:
  ssl: Make sure test starts in a "good" state
  ssl: Cuddle timeout

3 files changed, 9 insertions, 7 deletions

diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl
index fefecc0b65..14e5024b91 100644
--- a/lib/ssl/test/ssl_api_SUITE.erl
+++ b/lib/ssl/test/ssl_api_SUITE.erl
@@ -1251,8 +1251,9 @@ der_input(Config) when is_list(Config) ->
     [_, _,_, _, Prop] = StatusInfo,
     State = ssl_test_lib:state(Prop),
     [CADb | _] = element(6, State),
-
+    ct:sleep(?SLEEP*2), %%Make sure there is no outstanding clean cert db msg in manager
     Size = ets:info(CADb, size),
+    ct:pal("Size ~p", [Size]),
 
     SeverVerifyOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     {ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
@@ -1281,6 +1282,7 @@ der_input(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
+    %% Using only DER input should not increase file indexed DB 
     Size = ets:info(CADb, size).
 
 %%--------------------------------------------------------------------
@@ -1902,7 +1904,7 @@ do_recv_close(Socket) ->
 
 tls_close(Socket) ->
     ok = ssl_test_lib:send_recv_result(Socket),
-    case ssl:close(Socket, 5000) of
+    case ssl:close(Socket, 10000) of
         ok ->
             ok;
         {error, closed} ->
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index b71b15b028..553c2d247b 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -28,7 +28,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 -define(DELAY, 500).
--define(SLEEP, 500).
+-define(SLEEP, 1000).
 -define(TIMEOUT, 60000).
 -define(LONG_TIMEOUT, 600000).
 -define(MAX_TABLE_SIZE, 5).
@@ -207,7 +207,7 @@ session_cleanup(Config) when is_list(Config) ->
 	end,
 
     %% Make sure session is registered
-    ct:sleep(?SLEEP),
+    ct:sleep(?SLEEP*2),
 
     {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
     [_, _,_, _, Prop] = StatusInfo,
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl
index 5a74ec1892..7239d4cb90 100644
--- a/lib/ssl/test/tls_api_SUITE.erl
+++ b/lib/ssl/test/tls_api_SUITE.erl
@@ -794,16 +794,16 @@ tls_downgrade_result(Socket, Pid) ->
                 {tcp, TCPSocket, <<"Downgraded">>} ->
 	             ok;
                 {tcp_closed, TCPSocket} ->
-                    ct:fail("Peer timed out, downgrade aborted"),
+                    ct:fail("Did not receive TCP data"),
 	            ok;
 	        Other ->
                     {error, Other}
             end;
 	{error, timeout} ->
-	    ct:fail("Timed out, downgrade aborted"),
+	    ct:comment("Timed out, downgrade aborted"),
 	    ok;
 	Fail ->
-	    {error, Fail}
+            ct:fail(Fail)
     end.
 
 tls_shutdown_result(Socket, server) ->