summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 19:42:05 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 19:42:05 +0000
commit370f0840af1d07f2186c047b0a1566331206e8a5 (patch)
treeaf668b2e36e443e6cb6795faeb28a33ba7640fab /base/test
parent79d23c7eca174feb74093670569088c2c8956e82 (diff)
downloadchromium_src-370f0840af1d07f2186c047b0a1566331206e8a5.zip
chromium_src-370f0840af1d07f2186c047b0a1566331206e8a5.tar.gz
chromium_src-370f0840af1d07f2186c047b0a1566331206e8a5.tar.bz2
Increase test timeout to 45s.
This is so that long running tests don't flakily bump into the timeout every now and then. BUG=none TEST=none TBR=phajdan.jr Review URL: http://codereview.chromium.org/7595008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
-rw-r--r--base/test/test_timeouts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index ccc33f7..ec56bcb 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -44,7 +44,7 @@ bool TestTimeouts::initialized_ = false;
// static
int TestTimeouts::tiny_timeout_ms_ = 100;
int TestTimeouts::action_timeout_ms_ = 2000;
-int TestTimeouts::action_max_timeout_ms_ = 31000;
+int TestTimeouts::action_max_timeout_ms_ = 45000;
int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;