diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 19:48:10 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 19:48:10 +0000 |
| commit | a5a6258f47094a5645ccc7b5834a0cc08c0974c7 (patch) | |
| tree | 2adbcfe1d1f8ac3bcd79b40804f38b40dc95957c /base/test/test_timeouts.cc | |
| parent | b577f646a6122df49335f202aeedd52bade356a4 (diff) | |
| download | chromium_src-a5a6258f47094a5645ccc7b5834a0cc08c0974c7.zip chromium_src-a5a6258f47094a5645ccc7b5834a0cc08c0974c7.tar.gz chromium_src-a5a6258f47094a5645ccc7b5834a0cc08c0974c7.tar.bz2 | |
GTTF: Prefetch the browser with a longer timeout before running browser tests.
Also remove hacky code to increase timeout for specific tests.
Instead, allow to increase test termination timeout
via SLOW_ prefix (should be used as last resort).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6410059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test/test_timeouts.cc')
| -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 016456e..20cd8a9 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_ = 15000; +int TestTimeouts::action_max_timeout_ms_ = 20000; int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000; |