diff options
| author | Anders Svensson <[email protected]> | 2013-04-09 15:57:19 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-04-15 10:10:02 +0200 |
| commit | 96d04d58fd91062a6e5f96fbc6cce49ee325d087 (patch) | |
| tree | 1e94d8f450fa4c4a2933254d96896c173b669f70 /lib/diameter/test/diameter_tls_SUITE.erl | |
| parent | ba278bc64de031a571c8c5ea01d84287c67307db (diff) | |
| download | otp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.tar.gz otp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.tar.bz2 otp-96d04d58fd91062a6e5f96fbc6cce49ee325d087.zip | |
Lighten up on suite timetraps
Due to sporadic timeouts one some (slow) hosts.
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) |