Merge branch 'anders/diameter/reopen/OTP-10692'

* anders/diameter/reopen/OTP-10692:
  Fix testcases in event suite
  Fix faulty watchdog transition INITIAL -> DOWN
  Fix faulty watchdog transition DOWN -> INITIAL
  Comment fixes
  Rename records peer/conn -> watchdog/peer in diameter_service
  Add testcases to traffic suite
  Simplify watchdog transitions in service process
  Simplify transport shutdown
  Remove upgrade code not needed after application restart
  Tweak (make) silent rules support

3 files changed, 14 insertions, 11 deletions

diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
index 7c1c76f22a..18bdcb1f54 100644
--- a/lib/diameter/test/diameter_event_SUITE.erl
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -121,7 +121,6 @@ down(Config) ->
                                   {applications, [?DICT_ACCT]},
                                   {reconnect_timer, 5000}]),
     start = event(Svc),
-    {watchdog, Ref, _, {initial, down}, _} = event(Svc),
     {closed, Ref, {'CEA', ?NO_COMMON_APP, _, #diameter_packet{}}, _}
         = event(Svc),
     {reconnect, Ref, _} = event(Svc).
@@ -132,7 +131,6 @@ cea_timeout(Config) ->
     {Svc, Ref} = connect(Config, [{capx_timeout, ?SERVER_CAPX_TMO div 2},
                                   {reconnect_timer, 2*?SERVER_CAPX_TMO}]),
     start = event(Svc),
-    {watchdog, Ref, _, {initial, down}, _} = event(Svc),
     {closed, Ref, {'CEA', timeout}, _} = event(Svc).
 
 stop(_Config) ->
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index b03a9ce4d1..f8db4a6863 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -80,7 +80,9 @@
          send_multiple_filters_2/1,
          send_multiple_filters_3/1,
          send_anything/1,
+         outstanding/1,
          remove_transports/1,
+         empty/1,
          stop_services/1,
          stop/1]).
 
@@ -202,7 +204,7 @@ all() ->
                                                C <- ?CONTAINERS,
                                                A <- ?ENCODINGS,
                                                P <- [[], [parallel]]]
-        ++ [remove_transports, stop_services, stop].
+        ++ [outstanding, remove_transports, empty, stop_services, stop].
 
 groups() ->
     Ts = tc(),
@@ -288,6 +290,11 @@ add_transports(Config) ->
           || C <- ?CONNECTIONS],
     ?util:write_priv(Config, "transport", [LRef | Cs]).
 
+%% Ensure there are no outstanding requests in request table.
+outstanding(_Config) ->
+    [] = [T || T <- ets:tab2list(diameter_request),
+               is_atom(element(1,T))].
+
 remove_transports(Config) ->
     [LRef | Cs] = ?util:read_priv(Config, "transport"),
     [?util:disconnect(?CLIENT, C, ?SERVER, LRef) || C <- Cs].
@@ -296,6 +303,10 @@ stop_services(_Config) ->
     ok = diameter:stop_service(?CLIENT),
     ok = diameter:stop_service(?SERVER).
 
+%% Ensure even transports have been removed from request table.
+empty(_Config) ->
+    [] = ets:tab2list(diameter_request).
+
 stop(_Config) ->
     ok = diameter:stop().
 
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index 7ce09e93ca..f9f72d364a 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -127,13 +127,7 @@ end_per_suite(_Config) ->
 %% ===========================================================================
 
 %% Test the watchdog state machine for the required failover, failback
-%% and reopen behaviour. Do this by having the testcase replace
-%% diameter_service and start watchdogs, and having this module
-%% implement a transport process that plays the role of the peer
-%% Diameter node.
-
-%reopen(_) ->
-%    reopen(connect, ?WD(10000), 1, 'DWR');
+%% and reopen behaviour by examining watchdog events.
 
 reopen(_) ->
     [] = run([[reopen, T, Wd, N, M]