Improved tests

1 files changed, 19 insertions, 32 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 63a9bb8d87..c47bb6140d 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -26,6 +26,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
+-record(sslsocket, { fd = nil, pid = nil}).
 
 timetrap(Time) ->
     Mul = try 
@@ -66,13 +67,7 @@ run_server(Opts) ->
     test_server:format("ssl:listen(~p, ~p)~n", [Port, Options]),
     {ok, ListenSocket} = rpc:call(Node, ssl, listen, [Port, Options]),
     Pid ! {listen, up},
-    case Port of
-	0 ->
-	    {ok, {_, NewPort}} = ssl:sockname(ListenSocket),	 
-	    Pid ! {self(), {port, NewPort}};
-	_ ->
-	    ok
-    end,
+    send_selected_port(Pid, Port, ListenSocket),
     run_server(ListenSocket, Opts).
 
 run_server(ListenSocket, Opts) ->
@@ -146,13 +141,9 @@ run_client(Opts) ->
 	{ok, Socket} ->
 	    Pid ! connected,
 	    test_server:format("Client: connected~n", []), 
-	    case proplists:get_value(port, Options) of
-		0 ->
-		    {ok, {_, NewPort}} = ssl:sockname(Socket),	 
-		    Pid ! {self(), {port, NewPort}};
-		_ ->
-		    ok
-	    end,
+	    %% In specail cases we want to know the client port, it will
+	    %% be indicated by sending {port, 0} in options list!
+	    send_selected_port(Pid,  proplists:get_value(port, Options), Socket),
 	    {Module, Function, Args} = proplists:get_value(mfa, Opts),
 	    test_server:format("Client: apply(~p,~p,~p)~n", 
 			       [Module, Function, [Socket | Args]]),
@@ -325,15 +316,7 @@ run_upgrade_server(Opts) ->
     test_server:format("gen_tcp:listen(~p, ~p)~n", [Port, TcpOptions]),
     {ok, ListenSocket} = rpc:call(Node, gen_tcp, listen, [Port, TcpOptions]),
     Pid ! {listen, up},
-
-    case Port of
-	0 ->
-	    {ok, {_, NewPort}} = inet:sockname(ListenSocket),	 
-	    Pid ! {self(), {port, NewPort}};
-	_ ->
-	    ok
-    end,
-
+    send_selected_port(Pid, Port, ListenSocket),
     test_server:format("gen_tcp:accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, [ListenSocket]),
 
@@ -376,13 +359,7 @@ run_upgrade_client(Opts) ->
 		       [Host, Port, TcpOptions]),
     {ok, Socket} = rpc:call(Node, gen_tcp, connect, [Host, Port, TcpOptions]),
 
-    case proplists:get_value(port, Opts) of
-	0 ->
-	    {ok, {_, NewPort}} = inet:sockname(Socket),	 
-	    Pid ! {self(), {port, NewPort}};
-	_ ->
-	    ok
-    end,
+    send_selected_port(Pid, Port, Socket),
 
     test_server:format("ssl:connect(~p, ~p)~n", [Socket, SslOptions]),
     {ok, SslSocket} = rpc:call(Node, ssl, connect, [Socket, SslOptions]),
@@ -415,6 +392,7 @@ run_server_error(Opts) ->
 	    %% To make sure error_client will
 	    %% get {error, closed} and not {error, connection_refused}
 	    Pid ! {listen, up},
+	    send_selected_port(Pid, Port, ListenSocket),
 	    test_server:format("ssl:transport_accept(~p)~n", [ListenSocket]),
 	    case rpc:call(Node, ssl, transport_accept, [ListenSocket]) of
 		{error, _} = Error ->
@@ -452,8 +430,8 @@ inet_port(Pid) when is_pid(Pid)->
 
 inet_port(Node) ->
     {Port, Socket} = do_inet_port(Node),
-    rpc:call(Node, gen_tcp, close, [Socket]),
-    Port.
+     rpc:call(Node, gen_tcp, close, [Socket]),
+     Port.
 
 do_inet_port(Node) ->
     {ok, Socket} = rpc:call(Node, gen_tcp, listen, [0, [{reuseaddr, true}]]),
@@ -490,3 +468,12 @@ trigger_renegotiate(Socket, ErlData, N, Id) ->
     ssl:send(Socket, ErlData),
     trigger_renegotiate(Socket, ErlData, N-1, Id).				   
     
+
+send_selected_port(Pid, 0, #sslsocket{} = Socket) ->
+    {ok, {_, NewPort}} = ssl:sockname(Socket),	 
+    Pid ! {self(), {port, NewPort}};
+send_selected_port(Pid, 0, Socket) ->
+    {ok, {_, NewPort}} = inet:sockname(Socket),	 
+    Pid ! {self(), {port, NewPort}};
+send_selected_port(_,_,_) ->
+    ok.