diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:05:49 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:05:49 +0200 |
| commit | 0c14550c6d768014ccb2e0de570877bb1580ffea (patch) | |
| tree | 8b8a517f2d5d58ae22d216c48db862c8b22107af /lib/diameter/test/diameter_capx_SUITE.erl | |
| parent | b5947ba9674c2c487944eb3f190ebd524a88e101 (diff) | |
| parent | 12febf1392d53cefe072860fdc60df85809ea90d (diff) | |
| download | otp-0c14550c6d768014ccb2e0de570877bb1580ffea.tar.gz otp-0c14550c6d768014ccb2e0de570877bb1580ffea.tar.bz2 otp-0c14550c6d768014ccb2e0de570877bb1580ffea.zip | |
Merge branch 'anders/diameter/test_suites/OTP-10214' into maint
* anders/diameter/test_suites/OTP-10214:
Increase buffer sizes in gen_sctp suite
Exercise service_info in test suites
Lighten up on timetraps in test suites
Fix timing issue with subscribe in test suites
Diffstat (limited to 'lib/diameter/test/diameter_capx_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_capx_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_capx_SUITE.erl b/lib/diameter/test/diameter_capx_SUITE.erl index 54a161d606..ae128b8203 100644 --- a/lib/diameter/test/diameter_capx_SUITE.erl +++ b/lib/diameter/test/diameter_capx_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2011. All Rights Reserved. +%% Copyright Ericsson AB 2010-2012. 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 @@ -93,12 +93,12 @@ -define(fail(T), erlang:error({T, process_info(self(), messages)})). --define(TIMEOUT, 2000). +-define(TIMEOUT, 10000). %% =========================================================================== suite() -> - [{timetrap, {seconds, 10}}]. + [{timetrap, {seconds, 60}}]. all() -> [start, start_services, |