diff options
| author | Anders Svensson <[email protected]> | 2014-12-01 14:53:31 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-12-01 14:53:31 +0100 |
| commit | 2ed565e2f3ff7359f59528899a562381501e3ce9 (patch) | |
| tree | 028ed99cf9aae96300d1e3eb05f9babda9474767 /lib/diameter/test/diameter_transport_SUITE.erl | |
| parent | db121b268b5aaa2e4a3d5088b1e9500d5e4a94e3 (diff) | |
| parent | 2b89e8bd5a8258c4259ed53cc0331d4fbe1f1aa3 (diff) | |
| download | otp-2ed565e2f3ff7359f59528899a562381501e3ce9.tar.gz otp-2ed565e2f3ff7359f59528899a562381501e3ce9.tar.bz2 otp-2ed565e2f3ff7359f59528899a562381501e3ce9.zip | |
Merge branch 'anders/diameter/connect_timer/OTP-12281' into maint
* anders/diameter/connect_timer/OTP-12281:
Tweak reason in closed event
Fix ignored connect timer
Check {connect,watchdog}_timer distinction in event testcases
Rename reconnect_timer to connect_timer in examples and suites
Diffstat (limited to 'lib/diameter/test/diameter_transport_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_transport_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl index 9408fae62c..fcffa69c24 100644 --- a/lib/diameter/test/diameter_transport_SUITE.erl +++ b/lib/diameter/test/diameter_transport_SUITE.erl @@ -194,7 +194,7 @@ reconnect({connect, Ref}) -> true = diameter:subscribe(SvcName), ok = start_service(SvcName), [{{_, _, LRef}, Pid}] = diameter_reg:wait({?MODULE, Ref, '_'}), - CRef = ?util:connect(SvcName, tcp, LRef, [{reconnect_timer, 2000}, + CRef = ?util:connect(SvcName, tcp, LRef, [{connect_timer, 2000}, {watchdog_timer, 6000}]), %% Tell partner to kill transport after seeing that there are no |