3 files changed, 25 insertions, 9 deletions
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index d10ee83ba4..ad5b3f9420 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -157,7 +157,7 @@
          {length_errors,
           [[exit], [handle], [discard]],
           [[x]]},
-         {reconnect_timer,
+         {connect_timer,
           [[3000]],
           [[infinity]]},
          {watchdog_timer,
diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
index 94b4967921..f43f111d20 100644
--- a/lib/diameter/test/diameter_event_SUITE.erl
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -107,29 +107,38 @@ start_server(Config) ->
 %% Connect with matching capabilities and expect the connection to
 %% come up.
 up(Config) ->
-    {Svc, Ref} = connect(Config, []),
+    {Svc, Ref} = connect(Config, [{connect_timer, 5000},
+                                  {watchdog_timer, 15000}]),
     start = event(Svc),
-    {up, Ref, {_,_Caps}, _Config, #diameter_packet{}} = event(Svc),
-    {watchdog, Ref, _, {initial, okay}, _} = event(Svc).
+    {up, Ref, {TPid, Caps}, Cfg, #diameter_packet{}} = event(Svc),
+    {watchdog, Ref, _, {initial, okay}, _} = event(Svc),
+    %% Kill the transport process and see that the connection is
+    %% reestablished after a watchdog timeout, not after connect_timer
+    %% expiry.
+    exit(TPid, kill),
+    {down, Ref, {TPid, Caps}, Cfg} = event(Svc),
+    {watchdog, Ref, _, {okay, down}, _} = event(Svc),
+    {reconnect, Ref, _} = event(Svc, 10000, 20000).
 
 %% Connect with non-matching capabilities and expect CEA from the peer
 %% to indicate as much and then for the transport to be restarted
-%% (after reconnect_timer).
+%% (after connect_timer).
 down(Config) ->
     {Svc, Ref} = connect(Config, [{capabilities, [{'Acct-Application-Id',
                                                    [?DICT_ACCT:id()]}]},
                                   {applications, [?DICT_ACCT]},
-                                  {reconnect_timer, 5000}]),
+                                  {connect_timer, 5000},
+                                  {watchdog_timer, 20000}]),
     start = event(Svc),
     {closed, Ref, {'CEA', ?NO_COMMON_APP, _, #diameter_packet{}}, _}
         = event(Svc),
-    {reconnect, Ref, _} = event(Svc).
+    {reconnect, Ref, _} = event(Svc, 4000, 10000).
 
 %% Connect with matching capabilities but have the server delay its
 %% CEA and cause the client to timeout.
 cea_timeout(Config) ->
     {Svc, Ref} = connect(Config, [{capx_timeout, ?SERVER_CAPX_TMO div 2},
-                                  {reconnect_timer, 2*?SERVER_CAPX_TMO}]),
+                                  {connect_timer, 2*?SERVER_CAPX_TMO}]),
     start = event(Svc),
     {closed, Ref, {'CEA', timeout}, _} = event(Svc).
 
@@ -165,6 +174,13 @@ uniq() ->
 event(Name) ->
     receive #diameter_event{service = Name, info = T} -> T end.
 
+event(Name, TL, TH) ->
+    T0 = now(),
+    Event = event(Name),
+    DT = timer:now_diff(now(), T0) div 1000,
+    {true, true, DT, Event} = {TL < DT, DT < TH, DT, Event},
+    Event.
+
 start_service(Name, Opts) ->
     diameter:start_service(Name, [{monitor, self()} | Opts]).
 
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