aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-05-23 14:54:52 +0200
committerAnders Svensson <[email protected]>2015-05-24 16:13:42 +0200
commit694db07c1383cfed66339b219fcf92c7a40bcfa8 (patch)
tree79811e16c7deec10e3c48dc0bb0873ded5083dcf /lib
parentfadf753b0cf00a56f84da8b190ca43bcc19446d4 (diff)
downloadotp-694db07c1383cfed66339b219fcf92c7a40bcfa8.tar.gz
otp-694db07c1383cfed66339b219fcf92c7a40bcfa8.tar.bz2
otp-694db07c1383cfed66339b219fcf92c7a40bcfa8.zip
Tweak transport suite failures
Make anything but a comm_up sctp_assoc_change crash. Make timeouts more reasonable.
Diffstat (limited to 'lib')
-rw-r--r--lib/diameter/test/diameter_transport_SUITE.erl17
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index f098851bea..78bddbd1cf 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -64,7 +64,7 @@
= #diameter_caps{host_ip_address
= Addrs}}).
-%% The term we register after open a listening port with gen_tcp.
+%% The term we register after open a listening port with gen_{tcp,sctp}.
-define(TEST_LISTENER(Ref, PortNr),
{?MODULE, listen, Ref, PortNr}).
@@ -85,7 +85,7 @@
%% ===========================================================================
suite() ->
- [{timetrap, {minutes, 2}}].
+ [{timetrap, {seconds, 15}}].
all() ->
[start,
@@ -401,12 +401,13 @@ gen_listen(tcp) ->
%% gen_accept/2
gen_accept(sctp, Sock) ->
- Assoc = ?RECV(?SCTP(Sock, {_, #sctp_assoc_change{state = comm_up,
- outbound_streams = O,
- inbound_streams = I,
- assoc_id = A}}),
- {O, I, A}),
- putr(assoc, Assoc),
+ #sctp_assoc_change{state = comm_up,
+ outbound_streams = OS,
+ inbound_streams = IS,
+ assoc_id = Id}
+ = ?RECV(?SCTP(Sock, {_, #sctp_assoc_change{} = S}), S),
+
+ putr(assoc, {OS, IS, Id}),
{ok, Sock};
gen_accept(tcp, LSock) ->
gen_tcp:accept(LSock).