diff options
| author | Anders Svensson <[email protected]> | 2016-06-11 08:28:41 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2016-06-11 08:28:41 +0200 |
| commit | f027ac4d0f1d522e3b3d5c4695baf42a5cdd5330 (patch) | |
| tree | 5ad4a775aab432b7d8a83bdfc66318234942c73d /lib/diameter/test/diameter_relay_SUITE.erl | |
| parent | 78eeb8b231791c23c40ea6c653ef2962bc52ba6f (diff) | |
| parent | 80dc4f14b21cf316a8000f91cd77b1f0653afa7c (diff) | |
| download | otp-f027ac4d0f1d522e3b3d5c4695baf42a5cdd5330.tar.gz otp-f027ac4d0f1d522e3b3d5c4695baf42a5cdd5330.tar.bz2 otp-f027ac4d0f1d522e3b3d5c4695baf42a5cdd5330.zip | |
Merge branch 'anders/diameter/19/listen/OTP-13611'
* anders/diameter/19/listen/OTP-13611:
Fix leaking transports in traffic/relay suites
Close listening sockets at transport removal
Don't restart transport processes after transport removal
Rename diameter_reg:del -> remove
Add diameter_reg:subscribe/2
Add dialyzer specs to diameter_reg
Remove diameter_reg:repl/2
Remove diameter_reg bloat
Diffstat (limited to 'lib/diameter/test/diameter_relay_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_relay_SUITE.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_relay_SUITE.erl b/lib/diameter/test/diameter_relay_SUITE.erl index f766f54a80..b5e520e642 100644 --- a/lib/diameter/test/diameter_relay_SUITE.erl +++ b/lib/diameter/test/diameter_relay_SUITE.erl @@ -171,8 +171,9 @@ connect(Config) -> Conns)). disconnect(Config) -> - lists:foreach(fun({{CN,CR},{SN,SR}}) -> ?util:disconnect(CN,CR,SN,SR) end, - ?util:read_priv(Config, "cfg")). + [] = [{T,C} || C <- ?util:read_priv(Config, "cfg"), + T <- [break(C)], + T /= ok]. stop_services(_Config) -> [] = [{H,T} || H <- ?SERVICES, @@ -184,6 +185,13 @@ stop(_Config) -> %% ---------------------------------------- +break({{CN,CR},{SN,SR}}) -> + try + ?util:disconnect(CN,CR,SN,SR) + after + diameter:remove_transport(SN, SR) + end. + server(Name, Dict) -> ok = diameter:start_service(Name, ?SERVICE(Name, Dict)), {Name, ?util:listen(Name, tcp)}. |