diff options
author | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
commit | 9cccec48c38544df1d00230aeb340b37890ab8c8 (patch) | |
tree | ac04a6dbca68d4f93f6addc416579baaefa220b2 /lib/diameter/test/diameter_reg_SUITE.erl | |
parent | b42792cb96262b1c10baf3c756e439f68b1dc8e1 (diff) | |
parent | 919ef5de2858e606d4a9be3e0e995b0802c76e33 (diff) | |
download | otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.gz otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.bz2 otp-9cccec48c38544df1d00230aeb340b37890ab8c8.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Fix missing monitor in diameter_reg
Diffstat (limited to 'lib/diameter/test/diameter_reg_SUITE.erl')
-rw-r--r-- | lib/diameter/test/diameter_reg_SUITE.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl index e2a1ca00c3..cd9242faa8 100644 --- a/lib/diameter/test/diameter_reg_SUITE.erl +++ b/lib/diameter/test/diameter_reg_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2016. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ -export([add/1, add_new/1, remove/1, + down/1, terms/1, pids/1]). @@ -56,6 +57,7 @@ tc() -> [add, add_new, remove, + down, terms, pids]. @@ -88,6 +90,13 @@ remove(_) -> [{Ref, Pid}] = ?reg:match(Ref), Pid = self(). +down(_) -> + Ref = make_ref(), + {_, MRef} = spawn_monitor(fun() -> ?reg:add_new(Ref), timer:sleep(1000) end), + receive {'DOWN', MRef, process, _, _} -> ok end, + timer:sleep(1000), + [] = ?reg:match(Ref). + terms(_) -> Ref = make_ref(), true = ?reg:add_new(Ref), |