diff options
| author | Erlang/OTP <[email protected]> | 2015-05-29 12:40:17 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-05-29 12:40:17 +0200 |
| commit | 35ca4282c5bd8a91f80397d0b5c53b661811a374 (patch) | |
| tree | aae8899a8b1a555f2c7ac197a2904094497fbe40 /lib/diameter/test/diameter_transport_SUITE.erl | |
| parent | d55c8c8d6e56849bab20797bf35bd5dc69cfcd07 (diff) | |
| parent | f99b944f5d6faf3e8c56c10e3e81668bb44160e0 (diff) | |
| download | otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.gz otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.bz2 otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.zip | |
Merge branch 'anders/diameter/sctp/OTP-12744' into maint-17
* anders/diameter/sctp/OTP-12744:
Fix diameter_sctp listener race
Tweak transport suite failures
Run traffic suite over SCTP
Diffstat (limited to 'lib/diameter/test/diameter_transport_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_transport_SUITE.erl | 17 |
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). |