Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3065)

Unified Diff: chrome/browser/ui/panels/panel_drag_browsertest.cc

Issue 12223100: Disable repeatedly failing trybot panel tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_resize_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_drag_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_drag_browsertest.cc b/chrome/browser/ui/panels/panel_drag_browsertest.cc
index 08943efa73a5f68f799f1d546fd1730e414fc6c9..7db46fd5bcfe3a838a7cc85638f5102ba9ca26d2 100644
--- a/chrome/browser/ui/panels/panel_drag_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_drag_browsertest.cc
@@ -1076,7 +1076,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
+// http://crbug.com/175760; several panel tests failing regularly on mac.
+#if defined(OS_MAC)
+#define MAYBE_Attach DISABLED_Attach
+#else
+#define MAYBE_Attach Attach
+#endif
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_Attach) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection();
DetachedPanelCollection* detached_collection =
@@ -1136,7 +1142,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
panel_manager->CloseAll();
}
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
+// http://crbug.com/175760; several panel tests failing regularly on mac.
+#if defined(OS_MAC)
+#define MAYBE_AttachAndCancel DISABLED_AttachAndCancel
+#else
+#define MAYBE_AttachAndCancel AttachAndCancel
+#endif
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_AttachAndCancel) {
PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection();
DetachedPanelCollection* detached_collection =
@@ -1255,7 +1267,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
}
// Disabled on GTK in metacity: http://crbug.com/167114
-#if defined(TOOLKIT_GTK)
+// http://crbug.com/175760; several panel tests failing regularly on mac.
+#if defined(TOOLKIT_GTK) || defined(OS_MAC)
#define MAYBE_DetachWithSqueeze DISABLED_DetachWithSqueeze
#else
#define MAYBE_DetachWithSqueeze DetachWithSqueeze
@@ -1342,8 +1355,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_DetachWithSqueeze) {
panel_manager->CloseAll();
}
-// http://crbug.com/143247
-#if defined(OS_LINUX)
+// http://crbug.com/143247, http://crbug.com/175760
+#if defined(OS_LINUX) || defined(OS_MAC)
#define MAYBE_AttachWithSqueeze DISABLED_AttachWithSqueeze
#else
#define MAYBE_AttachWithSqueeze AttachWithSqueeze
« no previous file with comments | « chrome/browser/ui/panels/panel_browsertest.cc ('k') | chrome/browser/ui/panels/panel_resize_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698