diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 08:08:05 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 08:08:05 +0000 |
| commit | 8477e568f80707c5d504b602fe10afdab1ab20c8 (patch) | |
| tree | 765e79905867d0c3098b3e5a3b8faa76caf08ebe /chrome/browser/in_process_webkit | |
| parent | fe7f21bf4373de03fdfe678b28d45ce61b70533d (diff) | |
| download | chromium_src-8477e568f80707c5d504b602fe10afdab1ab20c8.zip chromium_src-8477e568f80707c5d504b602fe10afdab1ab20c8.tar.gz chromium_src-8477e568f80707c5d504b602fe10afdab1ab20c8.tar.bz2 | |
[GTTF] Unify polling interval in some of the polling functions
in the UI test framework:
- WaitUntilCookieValue
- WaitUntilCookieNonEmpty
- WaitUntilJavaScriptCondition
This helps reduce number of arbitrary "magic timeouts" which are different
in each test.
We don't remove the test timeout parameter, because it varies depending on test case,
and for now we don't have a better solution. Trying a "naive" way leads to hangs
on flaky tests.
TEST=UI-based tests
BUG=none
Review URL: http://codereview.chromium.org/1557001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/in_process_webkit')
| -rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_uitest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc index d3f97f6..2da6e66 100644 --- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc +++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc @@ -72,8 +72,7 @@ class DOMStorageTest : public UILayoutTest { ASSERT_TRUE(tab->SetCookie(url, "")); ASSERT_TRUE(tab->NavigateToURL(url)); - WaitUntilCookieNonEmpty(tab.get(), url, "cleared", kTestIntervalMs, - action_max_timeout_ms()); + WaitUntilCookieNonEmpty(tab.get(), url, "cleared", action_max_timeout_ms()); } // Runs each test in an array of strings until it hits a NULL. |