diff options
| author | Anders Svensson <[email protected]> | 2013-05-29 11:32:44 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-05-29 11:32:44 +0200 |
| commit | 59fc364f7426d1a05d916900b42ba7aa0fda32bc (patch) | |
| tree | 236dcbb7ead4ddf79c5374a886896fe6c435cdf0 /lib/diameter/test/diameter_tls_SUITE.erl | |
| parent | 3f6185714ee9b383d9ba330e02b73017bf68babc (diff) | |
| parent | 87340609df5c1b7e8d28b4bb70356bcfbc258ab2 (diff) | |
| download | otp-59fc364f7426d1a05d916900b42ba7aa0fda32bc.tar.gz otp-59fc364f7426d1a05d916900b42ba7aa0fda32bc.tar.bz2 otp-59fc364f7426d1a05d916900b42ba7aa0fda32bc.zip | |
Merge branch 'anders/diameter/timetraps/OTP-10914' into maint
* anders/diameter/timetraps/OTP-10914:
Add examples testcase to help identify timetrap failures
Minor traffic suite fix
Add gen_tcp suite
Lighten up on suite timetraps
Add more information to traffic suite timeout failures
Diffstat (limited to 'lib/diameter/test/diameter_tls_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_tls_SUITE.erl | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl index 5a79c63d36..55565692ec 100644 --- a/lib/diameter/test/diameter_tls_SUITE.erl +++ b/lib/diameter/test/diameter_tls_SUITE.erl @@ -181,7 +181,7 @@ start_diameter(_Config) -> ok = diameter:start(). make_certs() -> - [{timetrap, {seconds, 30}}]. + [{timetrap, {minutes, 2}}]. make_certs(Config) -> Dir = proplists:get_value(priv_dir, Config), @@ -302,9 +302,7 @@ set([H|T], Vs) -> disconnect({{LRef, _PortNr}, CRef}) -> ok = diameter:remove_transport(?CLIENT, CRef), - ok = receive #diameter_event{info = {down, LRef, _, _}} -> ok - after 2000 -> false - end. + receive #diameter_event{info = {down, LRef, _, _}} -> ok end. realm(Host) -> tl(lists:dropwhile(fun(C) -> C /= $. end, Host)). @@ -365,13 +363,11 @@ ssl([{ssl_options = T, Opts}]) -> connect(Host, {_LRef, PortNr}, {Caps, Opts}) -> {ok, Ref} = diameter:add_transport(Host, ?CONNECT(PortNr, Caps, Opts)), - ok = receive - #diameter_event{service = Host, - info = {up, Ref, _, _, #diameter_packet{}}} -> - ok - after 2000 -> - false - end, + receive + #diameter_event{service = Host, + info = {up, Ref, _, _, #diameter_packet{}}} -> + ok + end, Ref. copts(S, Opts) |