summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
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/browser/views
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/browser/views')
-rw-r--r--chrome/browser/views/tabs/tab_dragging_test.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index b30989e..2c41f5b 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -23,7 +23,8 @@
// tabs out.
#define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
#else
-#define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip
+// Flaky, http://crbug.com/62311.
+#define MAYBE_Tab2OutOfTabStrip FLAKY_Tab2OutOfTabStrip
#endif
#if defined(OS_LINUX)
@@ -42,8 +43,9 @@
#define MAYBE_Tab1Tab2 DISABLED_Tab1Tab2
#define MAYBE_Tab1Tab3 DISABLED_Tab1Tab3
#else
-#define MAYBE_Tab1Tab2 Tab1Tab2
-#define MAYBE_Tab1Tab3 Tab1Tab3
+// Flaky, http://crbug.com/62311.
+#define MAYBE_Tab1Tab2 FLAKY_Tab1Tab2
+#define MAYBE_Tab1Tab3 FLAKY_Tab1Tab3
#endif
class TabDraggingTest : public UITest {