diff options
| author | Anders Svensson <[email protected]> | 2014-05-25 09:28:09 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-05-25 09:28:09 +0200 |
| commit | a9ee1f31d669143303f38b3f8d4568fad568d841 (patch) | |
| tree | 8bcaa9827b086e3d58d15b55218956fdd519bad8 /lib/diameter/test | |
| parent | 8231acf6362e8902ca60ecabbafc18f42ec4534a (diff) | |
| parent | a8f56846ab342d85a6d6e72f9ba129c8a7f0c1bf (diff) | |
| download | otp-a9ee1f31d669143303f38b3f8d4568fad568d841.tar.gz otp-a9ee1f31d669143303f38b3f8d4568fad568d841.tar.bz2 otp-a9ee1f31d669143303f38b3f8d4568fad568d841.zip | |
Merge branch 'anders/diameter/request_leak/OTP-11893' into maint
* anders/diameter/request_leak/OTP-11893:
Fix leaking request table
Add check that request table is empty to failover suite
Comment fix
Diffstat (limited to 'lib/diameter/test')
| -rw-r--r-- | lib/diameter/test/diameter_dpr_SUITE.erl | 8 | ||||
| -rw-r--r-- | lib/diameter/test/diameter_failover_SUITE.erl | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_dpr_SUITE.erl b/lib/diameter/test/diameter_dpr_SUITE.erl index 9252650bf7..f3f16b06e0 100644 --- a/lib/diameter/test/diameter_dpr_SUITE.erl +++ b/lib/diameter/test/diameter_dpr_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012. All Rights Reserved. +%% Copyright Ericsson AB 2012-2014. 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 @@ -73,7 +73,7 @@ %% Valid values for Disconnect-Cause. -define(CAUSES, [0, rebooting, 1, busy, 2, goaway]). -%% Establish one client connection for element of this list, +%% Establish one client connection for each element of this list, %% configured with disconnect/5 as disconnect_cb and returning the %% specified value. -define(RETURNS, @@ -129,8 +129,8 @@ stop_service(Config) -> service == group(Config) andalso (ok = diameter:stop_service(?CLIENT)). -%% Check for callbacks and stop the service. (Not the other way around -%% for the timing reason explained below.) +%% Check for callbacks before diameter:stop/0, not the other way around +%% for the timing reason explained below. check(Config) -> Grp = group(Config), [Pid | Refs] = ?util:read_priv(Config, config), diff --git a/lib/diameter/test/diameter_failover_SUITE.erl b/lib/diameter/test/diameter_failover_SUITE.erl index dfd3253827..c1494dcdb1 100644 --- a/lib/diameter/test/diameter_failover_SUITE.erl +++ b/lib/diameter/test/diameter_failover_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. 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 @@ -47,6 +47,7 @@ send_discard_1/1, send_discard_2/1, stop_services/1, + empty/1, stop/1]). %% diameter callbacks @@ -121,6 +122,7 @@ all() -> send_discard_1, send_discard_2, stop_services, + empty, stop]. %% =========================================================================== @@ -147,6 +149,10 @@ stop_services(_Config) -> T <- [diameter:stop_service(H)], T /= ok]. +%% Ensure transports have been removed from request table. +empty(_Config) -> + [] = ets:tab2list(diameter_request). + stop(_Config) -> ok = diameter:stop(). |