diff options
author | Anders Svensson <[email protected]> | 2014-12-01 14:53:56 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2014-12-01 14:53:56 +0100 |
commit | c2ff0b39afdebad49def5eb33893238c90f771ff (patch) | |
tree | 47766685c2ac8c469df921343c800e21a425e661 /lib/diameter/test/diameter_transport_SUITE.erl | |
parent | 5cc1a3f55e8f9a49a139234e1e6457a0020f98fe (diff) | |
parent | 427acaf7367da877730363e051eaa55c54faafca (diff) | |
download | otp-c2ff0b39afdebad49def5eb33893238c90f771ff.tar.gz otp-c2ff0b39afdebad49def5eb33893238c90f771ff.tar.bz2 otp-c2ff0b39afdebad49def5eb33893238c90f771ff.zip |
Merge branch 'maint'
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 |