From cd89997a5d9f8088355bb0e2f39059ac763c8bc2 Mon Sep 17 00:00:00 2001 From: "chrisgao@chromium.org" Date: Fri, 27 Sep 2013 18:27:02 +0000 Subject: [PATCH] [chromedriver] Disable two failed KeyConverter tests on Windows bot. BUG=none NOTRY=true Review URL: https://codereview.chromium.org/25102002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225744 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/chromedriver/key_converter_unittest.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/chrome/test/chromedriver/key_converter_unittest.cc b/chrome/test/chromedriver/key_converter_unittest.cc index bac66de027a237..183f813ddda769 100644 --- a/chrome/test/chromedriver/key_converter_unittest.cc +++ b/chrome/test/chromedriver/key_converter_unittest.cc @@ -236,7 +236,14 @@ TEST(KeyConverter, ToggleModifiers) { CheckEventsReleaseModifiers(keys, event_array, arraysize(event_array)); } -TEST(KeyConverter, AllShorthandKeys) { +#if defined(OS_WIN) +// https://code.google.com/p/chromedriver/issues/detail?id=546 +#define MAYBE_AllShorthandKeys DISABLED_AllShorthandKeys +#else +#define MAYBE_AllShorthandKeys AllShorthandKeys +#endif + +TEST(KeyConverter, MAYBE_AllShorthandKeys) { KeyEvent event_array[] = { CreateKeyDownEvent(ui::VKEY_RETURN, 0), CreateCharEvent("\r", "\r", 0), @@ -313,8 +320,9 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { } } -#if defined(OS_LINUX) -// Fails on bots: crbug.com/174962 +#if defined(OS_LINUX) || defined(OS_WIN) +// https://code.google.com/p/chromedriver/issues/detail?id=240 +// https://code.google.com/p/chromedriver/issues/detail?id=546 #define MAYBE_AllSpecialWebDriverKeysOnEnglishKeyboard \ DISABLED_AllSpecialWebDriverKeysOnEnglishKeyboard #else