ssl: Make test case timing independent

Refactored the code and moved client_check before call to
ssl_test_lib:check_result(Server, ExpectedSNIHostname) as this
call may consume client messages ( which is intentional) but was
missed by the test case writer.

2 files changed, 25 insertions, 20 deletions

diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl
index 748ee1844c..b059ff991b 100644
--- a/lib/ssl/test/ssl_sni_SUITE.erl
+++ b/lib/ssl/test/ssl_sni_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 8e325e814e..aca34cb6e9 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1243,15 +1243,16 @@ run_suites(Ciphers, Version, Config, Type) ->
 	    ct:fail(cipher_suite_failed_see_test_case_log)
     end.
 
-client_read_check([], _NewData) -> ok;
-client_read_check([Hd | T], NewData) ->
-    case binary:match(NewData, list_to_binary(Hd)) of
+client_read_check([], _Data) -> 
+    ok;
+client_read_check([Hd | T], Data) ->
+    case binary:match(Data, list_to_binary(Hd)) of
         nomatch ->
             nomatch;
         _ ->
-            client_read_check(T, NewData)
+            client_read_check(T, Data)
     end.
-client_read_bulk(Port, DataExpected, DataReceived) ->
+client_check_result(Port, DataExpected, DataReceived) ->
     receive
         {Port, {data, TheData}} ->
             Data = list_to_binary(TheData),
@@ -1261,15 +1262,14 @@ client_read_bulk(Port, DataExpected, DataReceived) ->
                 ok ->
                     ok;
                 _ ->
-                    client_read_bulk(Port, DataExpected, NewData)
-            end;
-        _ ->
-            ct:fail("unexpected_message")
-    after 4000 ->
-              ct:fail("timeout")
+                    client_check_result(Port, DataExpected, NewData)
+            end
+    after 3000 ->
+	    ct:fail({"Time out on opensssl Client", {expected, DataExpected},
+		     {got, DataReceived}})   
     end.
-client_read_bulk(Port, DataExpected) ->
-    client_read_bulk(Port, DataExpected, <<"">>).
+client_check_result(Port, DataExpected) ->
+    client_check_result(Port, DataExpected, <<"">>).
 
 send_and_hostname(SSLSocket) ->
     ssl:send(SSLSocket, "OK"),
@@ -1292,9 +1292,12 @@ erlang_server_openssl_client_sni_test(Config, SNIHostname, ExpectedSNIHostname,
                     end,
     ct:log("Options: ~p", [[ServerOptions, ClientCommand]]),
     ClientPort = open_port({spawn, ClientCommand}, [stderr_to_stdout]),
-    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
+
+    %% Client check needs to be done befor server check,
+    %% or server check might consume client messages
     ExpectedClientOutput = ["OK", "/CN=" ++ ExpectedCN ++ "/"],
-    ok = client_read_bulk(ClientPort, ExpectedClientOutput),
+    client_check_result(ClientPort, ExpectedClientOutput),
+    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
     ssl_test_lib:close_port(ClientPort),
     ssl_test_lib:close(Server),
     ok.
@@ -1318,12 +1321,14 @@ erlang_server_openssl_client_sni_test_sni_fun(Config, SNIHostname, ExpectedSNIHo
                     end,
     ct:log("Options: ~p", [[ServerOptions, ClientCommand]]),
     ClientPort = open_port({spawn, ClientCommand}, [stderr_to_stdout]),
-    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
+     
+    %% Client check needs to be done befor server check,
+    %% or server check might consume client messages
     ExpectedClientOutput = ["OK", "/CN=" ++ ExpectedCN ++ "/"],
-    ok = client_read_bulk(ClientPort, ExpectedClientOutput),
+    client_check_result(ClientPort, ExpectedClientOutput),
+    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
     ssl_test_lib:close_port(ClientPort),
-    ssl_test_lib:close(Server),
-    ok.
+    ssl_test_lib:close(Server).
 
 
 cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->