summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 11:47:10 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 11:47:10 +0000
commite2e7ab6de7f08bf0d41083178c2472acfd0cbdbf (patch)
tree3f22fcc3ec43d130bca2a8a1d43f4771ba8954e5
parent1cb23b23c037ea0ac5557a6796b79ec4f640b887 (diff)
downloadchromium_src-e2e7ab6de7f08bf0d41083178c2472acfd0cbdbf.zip
chromium_src-e2e7ab6de7f08bf0d41083178c2472acfd0cbdbf.tar.gz
chromium_src-e2e7ab6de7f08bf0d41083178c2472acfd0cbdbf.tar.bz2
Mark AutocompleteEditViewTest.PopupAccelerators as flaky on windows.
BUG=69941 TEST=None TBR=isherman Review URL: http://codereview.chromium.org/6336006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71652 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index 0b8dfcc..355310b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -361,7 +361,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, FLAKY_BrowserAccelerators) {
#endif
}
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PopupAccelerators) {
+// Flake on Win only. http://crbug.com/69941
+#if defined(OS_WIN)
+#define MAYBE_PopupAccelerators FLAKY_PopupAccelerators
+#else
+#define MAYBE_PopupAccelerators PopupAccelerators
+#endif
+
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, MAYBE_PopupAccelerators) {
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
// Create a popup.