summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 18:04:35 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-23 18:04:35 +0000
commit89306863d98635acbc50c8e0ec50ebd636c096d0 (patch)
tree3270d1b1026c31e9b0fbb8b1bc35d2fb450bd18c /chrome/test/startup
parent5968af3021ae91fe1cac7467762a1ffcb377499b (diff)
downloadchromium_src-89306863d98635acbc50c8e0ec50ebd636c096d0.zip
chromium_src-89306863d98635acbc50c8e0ec50ebd636c096d0.tar.gz
chromium_src-89306863d98635acbc50c8e0ec50ebd636c096d0.tar.bz2
Try to make the start up tests less flaky by switching
from ApplyAccelerator (which uses RunCommandAsync) to using RunCommand. This shouldn't impact the timing any. BUG=28448 Review URL: http://codereview.chromium.org/427005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
-rw-r--r--chrome/test/startup/feature_startup_test.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index 5f2ce16..fcb4563 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -80,15 +80,17 @@ class NewTabUIStartupTest : public UITest {
ASSERT_EQ(1, tab_count);
// Hit ctl-t and wait for the tab to load.
- window->ApplyAccelerator(IDC_NEW_TAB);
- ASSERT_TRUE(window->WaitForTabCountToBecome(2, 5000));
+ window->RunCommand(IDC_NEW_TAB);
+ ASSERT_TRUE(window->GetTabCount(&tab_count));
+ ASSERT_EQ(2, tab_count);
int load_time;
ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
if (want_warm) {
// Bring up a second tab, now that we've already shown one tab.
- window->ApplyAccelerator(IDC_NEW_TAB);
- ASSERT_TRUE(window->WaitForTabCountToBecome(3, 5000));
+ window->RunCommand(IDC_NEW_TAB);
+ ASSERT_TRUE(window->GetTabCount(&tab_count));
+ ASSERT_EQ(3, tab_count);
ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
}
timings[i] = TimeDelta::FromMilliseconds(load_time);