summaryrefslogtreecommitdiffstats
path: root/chrome/test/interactive_ui
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 10:36:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 10:36:03 +0000
commit815bd90907773648f8a110abd39888ef39b49e6d (patch)
treeb7665972d125a662487c51cb83c92629f61f5602 /chrome/test/interactive_ui
parentedcc7326354ca423a041a717feaec531b41711b9 (diff)
downloadchromium_src-815bd90907773648f8a110abd39888ef39b49e6d.zip
chromium_src-815bd90907773648f8a110abd39888ef39b49e6d.tar.gz
chromium_src-815bd90907773648f8a110abd39888ef39b49e6d.tar.bz2
Mark following tests as flaky due to an assertion failure:
- KeyboardAccessTest.TestShiftAltMenuKeyboardAccess - KeyboardAccessTest.ReserveKeyboardAccelerators - CollectedCookiesTest.DoubleDisplay - CollectedCookiesTest.NavigateAway - TabDraggingTest.Tab1Tab2 - TabDraggingTest.Tab1Tab3 - TabDraggingTest.Tab2OutOfTabStrip - NotificationsPermissionTest.TestUserGestureInfobar - NotificationsPermissionTest.TestNoUserGestureInfobar TBR=hbono, pkasting, jochen, sidchat, johnnyg BUG=62311 TEST=interactive_ui_tests Review URL: http://codereview.chromium.org/4676001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
-rw-r--r--chrome/test/interactive_ui/keyboard_access_uitest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index 0f90465..4bb92a8 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -115,16 +115,18 @@ TEST_F(KeyboardAccessTest, DISABLED_TestAltMenuKeyboardAccess) {
TestMenuKeyboardAccess(true, 0);
}
-TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) {
+// Flaky, http://crbug.com/62311.
+TEST_F(KeyboardAccessTest, FLAKY_TestShiftAltMenuKeyboardAccess) {
TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN);
}
+#if defined(OS_CHROMEOS)
// TODO(isherman): This test times out on ChromeOS. We should merge it with
// BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
-#if defined(OS_CHROMEOS)
#define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators
#else
-#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators
+// Flaky, http://crbug.com/62311.
+#define MAYBE_ReserveKeyboardAccelerators FLAKY_ReserveKeyboardAccelerators
#endif
// Test that JavaScript cannot intercept reserved keyboard accelerators like