diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 14:35:01 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 14:35:01 +0000 |
| commit | 9e72837c7361889e5d6d8c993b377b8496f1ba33 (patch) | |
| tree | 4d3221b26c5cc2192393507b1735b2538d0a7546 /chrome/test | |
| parent | 8a324fb82ac46b0153e3c0eceac873e9e9045693 (diff) | |
| download | chromium_src-9e72837c7361889e5d6d8c993b377b8496f1ba33.zip chromium_src-9e72837c7361889e5d6d8c993b377b8496f1ba33.tar.gz chromium_src-9e72837c7361889e5d6d8c993b377b8496f1ba33.tar.bz2 | |
GTTF: Keep the train fast, lower the UI test timeouts.
Watch out for tests that start to fail. Sorry, time to mark
them as FLAKY, DISABLED, or FAILS depending on how badly
they fail.
TEST=ui_tests
BUG=none
Review URL: http://codereview.chromium.org/3008002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 235616a..a4b6674 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -53,11 +53,11 @@ using base::TimeTicks; // Delay to let browser complete a requested action. static const int kWaitForActionMsec = 2000; -static const int kWaitForActionMaxMsec = 60000; +static const int kWaitForActionMaxMsec = 15000; // Command execution timeout passed to AutomationProxy. -static const int kCommandExecutionTimeout = 30000; +static const int kCommandExecutionTimeout = 15000; // Delay to let the browser shut down before trying more brutal methods. -static const int kWaitForTerminateMsec = 30000; +static const int kWaitForTerminateMsec = 15000; // Passed as value of kTestType. static const char kUITestType[] = "ui"; @@ -81,7 +81,7 @@ bool UITestBase::dump_histograms_on_exit_ = false; bool UITestBase::enable_dcheck_ = false; bool UITestBase::silent_dump_on_dcheck_ = false; bool UITestBase::disable_breakpad_ = false; -int UITestBase::timeout_ms_ = 20 * 60 * 1000; +int UITestBase::timeout_ms_ = 5 * 60 * 1000; std::wstring UITestBase::js_flags_ = L""; std::wstring UITestBase::log_level_ = L""; |