diff options
author | Anders Svensson <[email protected]> | 2013-07-23 13:48:25 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-07-23 13:48:25 +0200 |
commit | 4c4cf7d15b5179808e7e614694113e47277fd22d (patch) | |
tree | 7c1bb023ca6d0a6b3e6d7995ee98fa03bbab9596 /lib/diameter/test | |
parent | aba918012baf791ea55da96fb507eae8c30238ba (diff) | |
parent | e762d7d10b045623272430a91326eb936733acf0 (diff) | |
download | otp-4c4cf7d15b5179808e7e614694113e47277fd22d.tar.gz otp-4c4cf7d15b5179808e7e614694113e47277fd22d.tar.bz2 otp-4c4cf7d15b5179808e7e614694113e47277fd22d.zip |
Merge branch 'anders/diameter/inappropriate_DWR/OTP-11184' into maint
* anders/diameter/inappropriate_DWR/OTP-11184:
Ensure DWR isn't sent immediately after DWA
Comment tweaks
Diffstat (limited to 'lib/diameter/test')
-rw-r--r-- | lib/diameter/test/diameter_transport_SUITE.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl index 97f4cec11f..9408fae62c 100644 --- a/lib/diameter/test/diameter_transport_SUITE.erl +++ b/lib/diameter/test/diameter_transport_SUITE.erl @@ -180,12 +180,13 @@ reconnect({listen, Ref}) -> [_] = diameter_reg:wait({diameter_tcp, listener, {LRef, '_'}}), true = diameter_reg:add_new({?MODULE, Ref, LRef}), - %% Wait for partner to request transport death: kill to force the - %% peer to reconnect. + %% Wait for partner to request transport death. TPid = abort(SvcName, LRef, Ref), + %% Kill transport to force the peer to reconnect. exit(TPid, kill), + %% Wait for the partner again. abort(SvcName, LRef, Ref); reconnect({connect, Ref}) -> @@ -200,7 +201,7 @@ reconnect({connect, Ref}) -> %% reconnection attempts. abort(SvcName, Pid, Ref), - %% Transport does down and is reestablished. + %% Transport goes down and is reestablished. ?RECV(#diameter_event{service = SvcName, info = {down, CRef, _, _}}), ?RECV(#diameter_event{service = SvcName, info = {reconnect, CRef, _}}), ?RECV(#diameter_event{service = SvcName, info = {up, CRef, _, _, _}}), |