Merge branch 'ia/ssl/soft-upgrade' into maint

* ia/ssl/soft-upgrade:
  ssl: Correct soft upgrade test

2 files changed, 148 insertions, 35 deletions

diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index c95326941c..8d5bd6f8d8 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
+  {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
 	       {load_module, ssl_connection, soft_purge, soft_purge, []},
 	       {load_module, tls_connection, soft_purge, soft_purge, []},
 	       {load_module, ssl_session, soft_purge, soft_purge, []},
@@ -13,7 +13,7 @@
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
-  {<<"7.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
+  {<<"7\\.0">>, [{load_module, ssl, soft_purge, soft_purge, []},
 	       {load_module, ssl_connection, soft_purge, soft_purge, []},
 	       {load_module, tls_connection, soft_purge, soft_purge, []},
 	       {load_module, ssl_session, soft_purge, soft_purge, []},
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index 17b0240fe8..d65bdf6983 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -28,7 +28,8 @@
 	  config,
 	  server,
 	  client,
-	  soft
+	  soft,
+	  result_proxy
 	 }).
 
 all() -> 
@@ -77,45 +78,58 @@ upgrade_init(CTData, #state{config = Config} = State) ->
     {ok, {_, _, Up, _Down}} = ct_release_test:get_appup(CTData, ssl),
     ct:pal("Up: ~p", [Up]),
     Soft = is_soft(Up), %% It is symmetrical, if upgrade is soft so is downgrade  
+    Pid = spawn(?MODULE, result_proxy_init, [[]]),
     case Soft of 
 	true ->
-	    {Server, Client} = soft_start_connection(Config),
+	    {Server, Client} = soft_start_connection(Config, Pid),
 	    State#state{server = Server, client = Client,
-			soft = Soft};
+			soft = Soft,
+			result_proxy = Pid};
 	false ->
-	    State#state{soft = Soft}
+	    State#state{soft = Soft, result_proxy = Pid}
     end.
 
-upgrade_upgraded(_, #state{soft = false, config = Config} = State) -> 
-    {Server, Client} = restart_start_connection(Config),
-    ssl_test_lib:check_result(Server, ok, Client, ok),
+upgrade_upgraded(_, #state{soft = false, config = Config, result_proxy = Pid} = State) ->
+    ct:pal("Restart upgrade ~n", []),
+    {Server, Client} = restart_start_connection(Config, Pid),
+    Result = check_result(Pid, Server, Client),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
+    ok = Result,
     State;
 
 upgrade_upgraded(_, #state{server = Server0, client = Client0,
-			   config = Config, soft = true} = State) -> 
+			   config = Config, soft = true,
+			   result_proxy = Pid} = State) ->
+    ct:pal("Soft upgrade: ~n", []),
     Server0 ! changed_version,
     Client0 ! changed_version,
-    ssl_test_lib:check_result(Server0, ok, Client0, ok),
+    Result = check_result(Pid, Server0, Client0),
     ssl_test_lib:close(Server0),
     ssl_test_lib:close(Client0),
-    {Server, Client} = soft_start_connection(Config),
+    ok = Result,
+    {Server, Client} = soft_start_connection(Config, Pid),
     State#state{server = Server, client = Client}.
 
-upgrade_downgraded(_, #state{soft = false, config = Config} = State) -> 
-    {Server, Client} = restart_start_connection(Config),
-    ssl_test_lib:check_result(Server, ok, Client, ok),
+upgrade_downgraded(_, #state{soft = false, config = Config, result_proxy = Pid} = State) ->
+    ct:pal("Restart downgrade: ~n", []),
+    {Server, Client} = restart_start_connection(Config, Pid),
+    Result = check_result(Pid, Server, Client),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
+    Pid ! stop,
+    ok = Result,
     State;
 
-upgrade_downgraded(_, #state{server = Server, client = Client, soft = true} = State) -> 
+upgrade_downgraded(_, #state{server = Server, client = Client, soft = true, result_proxy = Pid} = State) ->
+    ct:pal("Soft downgrade: ~n", []),
     Server ! changed_version,
     Client ! changed_version,
-    ssl_test_lib:check_result(Server, ok, Client, ok),
+    Result = check_result(Pid, Server, Client),
+    Pid ! stop,
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
+    ok = Result,
     State.
 
 use_connection(Socket) ->
@@ -125,36 +139,35 @@ use_connection(Socket) ->
 	    ssl_test_lib:send_recv_result_active(Socket)
     end.
 
-soft_start_connection(Config) ->
+soft_start_connection(Config, ResulProxy) ->
     ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, use_connection, []}},
-					{options, ServerOpts}]),
+    Server = start_server([{node, ServerNode}, {port, 0},
+			   {from, ResulProxy},
+			   {mfa, {?MODULE, use_connection, []}},
+			   {options, ServerOpts}]),
     
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, use_connection, []}},
-					{options, ClientOpts}]),
+    Port = inet_port(ResulProxy, Server),
+    Client = start_client([{node, ClientNode}, {port, Port},
+			   {host, Hostname},
+			   {from, ResulProxy},
+			   {mfa, {?MODULE, use_connection, []}},
+			   {options, ClientOpts}]),
     {Server, Client}.
 
-restart_start_connection(Config) ->
+restart_start_connection(Config, ResulProxy) ->
     ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
+    Server = start_server([{node, ServerNode}, {port, 0},
+					{from, ResulProxy},
 					{mfa, {ssl_test_lib, send_recv_result_active, []}},
 					{options, ServerOpts}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+    Port = inet_port(ResulProxy, Server),
+    Client = start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-					{from, self()}, 
+					{from, ResulProxy},
 					{mfa, {ssl_test_lib, send_recv_result_active, []}},
 					{options, ClientOpts}]),
     {Server, Client}.
@@ -163,3 +176,103 @@ is_soft([{restart_application, ssl}]) ->
     false;
 is_soft(_) ->	
     true.
+
+result_proxy_init(Args) ->
+    result_proxy_loop(Args).
+
+result_proxy_loop(Args) ->
+    receive
+	{Pid, {check_result, Server, Client}} ->
+	    Result = do_check_result(Server, ok, Client, ok),
+	    Pid ! {self(), Result},
+	    result_proxy_loop(Args);
+	{Pid, port, Server} ->
+	    Port = recv_port(Server),
+	    Pid ! Port,
+	    result_proxy_loop(Args);
+	{Pid, listen} ->
+	    recv_listen(),
+	    Pid ! ok,
+	    result_proxy_loop(Args);
+	{Pid, connected} ->
+	    Connected = recv_connected(),
+	     Pid ! Connected,
+	    result_proxy_loop(Args)
+    end.
+
+check_result(Pid, Server, Client) ->
+    Pid ! {self(), {check_result, Server, Client}},
+    receive
+	{Pid, Result} ->
+	    Result
+    end.
+
+do_check_result(Server, ServerMsg, Client, ClientMsg) ->
+    receive
+	{Server, ServerMsg} ->
+	    do_check_result(Client, ClientMsg);
+
+	{Client, ClientMsg} ->
+	    do_check_result(Server, ServerMsg);
+	Unexpected ->
+	    {{expected, {Client, ClientMsg}},
+	     {expected, {Server, ServerMsg}}, {got, Unexpected}}
+    end.
+
+do_check_result(Pid, Msg) ->
+    receive
+	{Pid, Msg} ->
+	    ok;
+	Unexpected ->
+	    {{expected, {Pid, Msg}},
+	     {got, Unexpected}}
+    end.
+
+inet_port(Pid, Server) ->
+    Pid ! {self(), port, Server},
+    receive
+	{port, Port} ->
+	    Port
+    end.
+
+recv_port(Server) ->
+    receive
+	{Server, {port, Port}} ->
+	    {port, Port}
+    end.
+
+recv_connected() ->
+    receive
+	{connected, _Socket} ->
+	    ok;
+	{connect_failed, Reason} ->
+	    {connect_failed, Reason}
+    end.
+
+
+start_server(Args) ->
+    Pid = proplists:get_value(from, Args),
+    Result = spawn_link(ssl_test_lib, run_server, [Args]),
+    Pid ! {self(), listen},
+    receive
+	ok ->
+	    ok
+    end,
+    Result.
+
+start_client(Args) ->
+    Pid = proplists:get_value(from, Args),
+    Result = spawn_link(ssl_test_lib, run_client_init, [lists:delete(return_socket, Args)]),
+    Pid  ! {self(), connected},
+    receive
+	ok ->
+	    Result;
+	Reason ->
+	    exit(Reason)
+    end.
+
+recv_listen()->
+    receive
+	{listen, up} ->
+	    ok
+    end.