diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 07:15:16 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 07:15:16 +0000 |
| commit | 36589350415ced89e716015330fe210a8fcfd180 (patch) | |
| tree | 95673c9f4a7aebe659a3500902c7480ecbe10d2b /chrome/browser/browser_uitest.cc | |
| parent | 93b86a850b7b1b3f46a7c4fc4521fefa8ca56e8d (diff) | |
| download | chromium_src-36589350415ced89e716015330fe210a8fcfd180.zip chromium_src-36589350415ced89e716015330fe210a8fcfd180.tar.gz chromium_src-36589350415ced89e716015330fe210a8fcfd180.tar.bz2 | |
[GTTF] Tests cleanup:
- use timeouts correctly
- use more automation methods to make test code more clear
- use more reliable ways of waiting
- remove unnecessary automation calls
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1553016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 64634a0..08a6a9c4 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -111,7 +111,7 @@ TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Make sure that a new tab has been created and that we have a new renderer // process for it. ASSERT_TRUE(tab->NavigateToURLAsync(fork_url)); - PlatformThread::Sleep(action_timeout_ms()); + PlatformThread::Sleep(sleep_timeout_ms()); ASSERT_EQ(orig_process_count + 1, GetBrowserProcessCount()); int new_tab_count = -1; ASSERT_TRUE(window->GetTabCount(&new_tab_count)); @@ -162,7 +162,7 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { // Make sure that a new tab but not new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url)); - PlatformThread::Sleep(action_timeout_ms()); + PlatformThread::Sleep(sleep_timeout_ms()); ASSERT_EQ(orig_process_count, GetBrowserProcessCount()); int new_tab_count = -1; ASSERT_TRUE(window->GetTabCount(&new_tab_count)); @@ -174,7 +174,7 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { // Make sure that no new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url2)); - PlatformThread::Sleep(action_timeout_ms()); + PlatformThread::Sleep(sleep_timeout_ms()); ASSERT_EQ(orig_process_count, GetBrowserProcessCount()); } |