diff options
| author | Anders Svensson <[email protected]> | 2011-12-20 14:51:42 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-12-20 14:51:42 +0100 |
| commit | 0610ab240d5b4bdfe8b5a23f34dcbae81ba9adce (patch) | |
| tree | cee96b89ff7e487cebad5ca5397f3569f8489a4b /lib/diameter/test/diameter_watchdog_SUITE.erl | |
| parent | 40d571461d8fa708028fc6cb91ef6a1905cddd3c (diff) | |
| parent | 8a7b17a6d63377c323ab137ca8c0847280f9e24a (diff) | |
| download | otp-0610ab240d5b4bdfe8b5a23f34dcbae81ba9adce.tar.gz otp-0610ab240d5b4bdfe8b5a23f34dcbae81ba9adce.tar.bz2 otp-0610ab240d5b4bdfe8b5a23f34dcbae81ba9adce.zip | |
Merge branch 'anders/diameter/missed_events/OTP-9824' into maint
* anders/diameter/missed_events/OTP-9824:
Update watchdog suite
Ensure capabilities exchange can't fail too early
Diffstat (limited to 'lib/diameter/test/diameter_watchdog_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_watchdog_SUITE.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl index b40d7c104d..ff40326947 100644 --- a/lib/diameter/test/diameter_watchdog_SUITE.erl +++ b/lib/diameter/test/diameter_watchdog_SUITE.erl @@ -306,11 +306,8 @@ watchdog(Type, Ref, TPid, Wd) -> Opts = [{transport_module, ?MODULE}, {transport_config, TPid}, {watchdog_timer, Wd}], - monitor(diameter_watchdog:start({Type, Ref}, - {false, Opts, false, ?SERVICE})). - -monitor(Pid) -> - erlang:monitor(process, Pid), + {_MRef, Pid} = diameter_watchdog:start({Type, Ref}, + {false, Opts, false, ?SERVICE}), Pid. %% =========================================================================== @@ -350,6 +347,10 @@ init(_, _, TPid, _) -> monitor(TPid), 3. +monitor(Pid) -> + erlang:monitor(process, Pid), + Pid. + %% Generate a unique hostname for the faked peer. hostname() -> lists:flatten(io_lib:format("~p-~p-~p", tuple_to_list(now()))). |