diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 16:51:30 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 16:51:30 +0000 |
| commit | cef642ead38f856b5f25b1870660f051a2ce9fcb (patch) | |
| tree | d455cb9ff64b05fa0a5bd91208d91f2232e26e30 /base | |
| parent | 5e61ad9e375347ef4eebac900a5af6572ae2d995 (diff) | |
| download | chromium_src-cef642ead38f856b5f25b1870660f051a2ce9fcb.zip chromium_src-cef642ead38f856b5f25b1870660f051a2ce9fcb.tar.gz chromium_src-cef642ead38f856b5f25b1870660f051a2ce9fcb.tar.bz2 | |
Avoid long test_server timeouts by using action_timeout_ms
instead of action_max_timeout_ms.
This increases action_timeout_ms a little bit,
otherwise test_server becomes more flaky (fails to start in time).
This effectively reduces the timeout for TestServer start from 45s to 10s.
BUG=93770
Review URL: http://codereview.chromium.org/7744004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/test/test_timeouts.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 6bcf4bc..524e85e 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -43,7 +43,7 @@ bool TestTimeouts::initialized_ = false; // The timeout values should increase in the order they appear in this block. // static int TestTimeouts::tiny_timeout_ms_ = 100; -int TestTimeouts::action_timeout_ms_ = 2000; +int TestTimeouts::action_timeout_ms_ = 10000; int TestTimeouts::action_max_timeout_ms_ = 45000; int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000; |