diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 10:55:00 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 10:55:00 +0000 |
| commit | 9c80aaae68badb9a62ef837d3cfa4d8e15722d53 (patch) | |
| tree | 6d6cc897b4adf805d0e975c4d24973ed5cb98aa7 | |
| parent | f333344a8e19a38e774af8aa5ed12b83ad24c813 (diff) | |
| download | chromium_src-9c80aaae68badb9a62ef837d3cfa4d8e15722d53.zip chromium_src-9c80aaae68badb9a62ef837d3cfa4d8e15722d53.tar.gz chromium_src-9c80aaae68badb9a62ef837d3cfa4d8e15722d53.tar.bz2 | |
Set url fetch test timeout back to old values. Increase UI test command timeout a bit to accommodate failng tests.
BUG=none
TEST=Vista perf goes green; xp test dbg 2 goes green.
TBR=phajdan.jr
Review URL: http://codereview.chromium.org/3044007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52824 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/pyautolib/pyauto.py | 6 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/url_fetch_test/url_fetch_test.cc | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index fc3e306..4af6b1a 100644 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -238,11 +238,11 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): Args: function: the function whose truth value is to be evaluated timeout: the max timeout (in secs) for which to wait. The default - action is to wait for 60secs, and can be changed by - changing kWaitForActionMaxMsec in ui_test.cc. + action is to wait for kWaitForActionMaxMsec, as set in + ui_test.cc Use None to wait indefinitely. retry_sleep: the sleep interval (in secs) before retrying |function|. - Deaults to 0.25 secs. + Defaults to 0.25 secs. args: the args to pass to |function| Returns: diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index bce1584..90e1550 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -55,7 +55,7 @@ using base::TimeTicks; static const int kWaitForActionMsec = 2000; static const int kWaitForActionMaxMsec = 15000; // Command execution timeout passed to AutomationProxy. -static const int kCommandExecutionTimeout = 15000; +static const int kCommandExecutionTimeout = 25000; // Delay to let the browser shut down before trying more brutal methods. static const int kWaitForTerminateMsec = 15000; // Passed as value of kTestType. diff --git a/chrome/test/url_fetch_test/url_fetch_test.cc b/chrome/test/url_fetch_test/url_fetch_test.cc index e2e1f32..ec87c76 100644 --- a/chrome/test/url_fetch_test/url_fetch_test.cc +++ b/chrome/test/url_fetch_test/url_fetch_test.cc @@ -42,6 +42,10 @@ class UrlFetchTest : public UITest { browser_directory_ = dir; } UITest::SetUp(); + + // We've shortened the default timeouts, but dom_perf on Vista needs longer + // timeouts. Setting timeouts to the previous values before r52666. + set_action_timeout_ms(std::max(60000, action_timeout_ms())); } void RunTest(const GURL& url, const char* wait_cookie_name, |