diff options
| author | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 00:57:47 +0000 |
|---|---|---|
| committer | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 00:57:47 +0000 |
| commit | 7f981ed761c2b125f0ac51a990058291197b0809 (patch) | |
| tree | 7f3e6e2a3407a75793527e6ff51b12492b0c9076 /chrome/browser/browser_keyevents_browsertest.cc | |
| parent | 4b5afdaae88eac9c94cbc870499845696ccfb47a (diff) | |
| download | chromium_src-7f981ed761c2b125f0ac51a990058291197b0809.zip chromium_src-7f981ed761c2b125f0ac51a990058291197b0809.tar.gz chromium_src-7f981ed761c2b125f0ac51a990058291197b0809.tar.bz2 | |
Mark BrowserKeyEventsTest.ReservedAccelerators flaky on Mac.
BUG=50447
TEST=none
Review URL: http://codereview.chromium.org/3033034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 98dbd21..9c7ef65 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -669,7 +669,14 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) { #endif } -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, ReservedAccelerators) { +#if defined(OS_MACOSX) +// See http://crbug.com/50447 for details. +#define MAYBE_ReservedAccelerators FLAKY_ReservedAccelerators +#else +#define MAYBE_ReservedAccelerators ReservedAccelerators +#endif + +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { HTTPTestServer* server = StartHTTPServer(); ASSERT_TRUE(server); |