diff options
| author | Anders Svensson <[email protected]> | 2013-02-12 12:51:56 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-02-12 12:51:56 +0100 |
| commit | 1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7 (patch) | |
| tree | 0bb4c01bc6c303154814848e4a52b07a16f161bd /lib/diameter/test/diameter_watchdog_SUITE.erl | |
| parent | 5bb22560c350baa834196835640a5aab21e97f8a (diff) | |
| parent | 551bdf0da65bcb9838ddc613e0507e2871dcd5dc (diff) | |
| download | otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.tar.gz otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.tar.bz2 otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.zip | |
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
Diffstat (limited to 'lib/diameter/test/diameter_watchdog_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_watchdog_SUITE.erl | 10 |
1 files changed, 2 insertions, 8 deletions
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] |