From 8030b1bb8f8f2a049b0806af2234f023a427394e Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sun, 1 Feb 2015 09:23:42 +0100
Subject: Simplify transport suite

Using the fact that transport processes can now be started concurrently.
The suite serialized starts itself when pretending to be diameter
starting a transport process.
---
 lib/diameter/test/diameter_transport_SUITE.erl | 35 +++++---------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 23b972a9a0..64015f3336 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -365,37 +365,14 @@ start_connect(tcp, T, Svc, Opts) ->
     diameter_tcp:start(T, Svc, Opts).
 
 %% start_accept/2
-%%
-%% Start transports sequentially by having each wait for a message
-%% from a job in a queue before commencing. Only one transport with a
-%% pending accept is started at a time since diameter_{tcp,sctp}
-%% currently assume (and diameter currently implements) this.
 
 start_accept(Prot, Ref) ->
-    Pid = sync(accept, Ref),
     {Mod, Opts} = tmod(Prot),
-
-    try
-        {ok, TPid, [?ADDR]} = Mod:start({accept, Ref},
-                                        ?SVC([?ADDR]),
-                                        [{port, 0} | Opts]),
-        ?RECV(?TMSG({TPid, connected})),
-        TPid
-    after
-        Pid ! Ref
-    end.
-
-sync(What, Ref) ->
-    ok = diameter_sync:cast({?MODULE, What, Ref},
-                            [fun lock/2, Ref, self()],
-                            infinity,
-                            infinity),
-    receive {start, Ref, Pid} -> Pid end.
-
-lock(Ref, Pid) ->
-    Pid ! {start, Ref, self()},
-    erlang:monitor(process, Pid),
-    Ref = receive T -> T end.
+    {ok, TPid, [?ADDR]} = Mod:start({accept, Ref},
+                                    ?SVC([?ADDR]),
+                                    [{port, 0} | Opts]),
+    ?RECV(?TMSG({TPid, connected})),
+    TPid.
 
 tmod(sctp) ->
     {diameter_sctp, [{sctp_initmsg, ?SCTP_INIT}]};
-- 
cgit v1.2.3