diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 17:05:56 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 17:05:56 +0000 |
| commit | c5eabed7b8940d981cda43e4e55e96161e67288d (patch) | |
| tree | e88139c8f145b4b303359d011c1312fb7bc371c1 /chrome/browser/dom_ui | |
| parent | 1379919b2d25a6009270814ceee6d6ae97ea8030 (diff) | |
| download | chromium_src-c5eabed7b8940d981cda43e4e55e96161e67288d.zip chromium_src-c5eabed7b8940d981cda43e4e55e96161e67288d.tar.gz chromium_src-c5eabed7b8940d981cda43e4e55e96161e67288d.tar.bz2 | |
Tweaks to OptionUI tests to reduce flaky behavior. These changes are in-line w/ BookmarksUI tests that seem to behave better. Will re-evaluate later to determine if we can safely remove the flaky tag.
BUG=48521
TEST=Review behavior on flakiness dashboard after some time.
Review URL: http://codereview.chromium.org/3429019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/options_ui_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options_ui_uitest.cc index ae1aa9b..42d00a3 100644 --- a/chrome/browser/dom_ui/options_ui_uitest.cc +++ b/chrome/browser/dom_ui/options_ui_uitest.cc @@ -66,7 +66,7 @@ TEST_F(OptionsUITest, CommandOpensOptionsTab) { } // TODO(csilv): Investigate why this fails and fix. http://crbug.com/48521 -TEST_F(OptionsUITest, FAILS_CommandAgainGoesBackToOptionsTab) { +TEST_F(OptionsUITest, FLAKY_CommandAgainGoesBackToOptionsTab) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -86,7 +86,7 @@ TEST_F(OptionsUITest, FAILS_CommandAgainGoesBackToOptionsTab) { // Switch to first tab and run command again. ASSERT_TRUE(browser->ActivateTab(0)); ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); - ASSERT_TRUE(browser->RunCommandAsync(IDC_OPTIONS)); + ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); // Ensure the options ui tab is active. ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms())); @@ -105,7 +105,7 @@ TEST_F(OptionsUITest, FLAKY_TwoCommandsOneTab) { ASSERT_EQ(1, tab_count); ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); - ASSERT_TRUE(browser->RunCommandAsync(IDC_OPTIONS)); + ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); ASSERT_TRUE(browser->GetTabCount(&tab_count)); ASSERT_EQ(2, tab_count); } |