diff options
| author | Anders Svensson <[email protected]> | 2015-06-19 09:11:20 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-06-19 10:09:15 +0200 |
| commit | 8fae9fc78e32656702a5661af4be470395cfa23d (patch) | |
| tree | 8c6cf32964283e6a09308b233414b7a762557bee | |
| parent | 25f280a5af09bba20ca9db84ebfd9d0d67f3c7ff (diff) | |
| download | otp-8fae9fc78e32656702a5661af4be470395cfa23d.tar.gz otp-8fae9fc78e32656702a5661af4be470395cfa23d.tar.bz2 otp-8fae9fc78e32656702a5661af4be470395cfa23d.zip | |
Decrease unnecessarily long testsuite timetraps
| -rw-r--r-- | lib/diameter/test/diameter_gen_sctp_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/diameter/test/diameter_gen_tcp_SUITE.erl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl index 4ea5e80095..2a2f755892 100644 --- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl +++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl @@ -33,7 +33,7 @@ %% testcases -export([send_not_from_controlling_process/1, - send_from_multiple_clients/1, + send_from_multiple_clients/1, send_from_multiple_clients/0, receive_what_was_sent/1]). -include_lib("kernel/include/inet_sctp.hrl"). @@ -58,7 +58,7 @@ %% =========================================================================== suite() -> - [{timetrap, {minutes, 2}}]. + [{timetrap, {seconds, 10}}]. all() -> [send_not_from_controlling_process, @@ -167,6 +167,9 @@ send(Sock, Id) -> %% %% Demonstrates sluggish delivery of messages. +send_from_multiple_clients() -> + [{timetrap, {seconds, 60}}]. + send_from_multiple_clients(_) -> {S, Rs} = T = send_from_multiple_clients(8, 1024), Max = ?FOREVER*1000, diff --git a/lib/diameter/test/diameter_gen_tcp_SUITE.erl b/lib/diameter/test/diameter_gen_tcp_SUITE.erl index 4b542e0156..87c020e415 100644 --- a/lib/diameter/test/diameter_gen_tcp_SUITE.erl +++ b/lib/diameter/test/diameter_gen_tcp_SUITE.erl @@ -39,7 +39,7 @@ %% =========================================================================== suite() -> - [{timetrap, {minutes, 2}}]. + [{timetrap, {seconds, 10}}]. all() -> [connect, %% Appears to fail only when run first. |