Commit 8b987e96 authored by rdsmith@chromium.org's avatar rdsmith@chromium.org

Disable repeatedly failing trybot panel tests.

BUG=175760
TBR=jianli@chromium.org

Review URL: https://codereview.chromium.org/12223100

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182290 0039d316-1c4b-4281-b951-d872f2087c98
parent 97652b49
...@@ -1132,9 +1132,18 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DrawAttentionWhileMinimized) { ...@@ -1132,9 +1132,18 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DrawAttentionWhileMinimized) {
panel3->Close(); panel3->Close();
} }
// http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_StopDrawingAttentionWhileMinimized \
DISABLED_StopDrawingAttentionWhileMinimized
#else
#define MAYBE_StopDrawingAttentionWhileMinimized \
StopDrawingAttentionWhileMinimized
#endif
// Verify that minimized state of a panel is correct after draw attention // Verify that minimized state of a panel is correct after draw attention
// is stopped when there are other minimized panels. // is stopped when there are other minimized panels.
IN_PROC_BROWSER_TEST_F(PanelBrowserTest, StopDrawingAttentionWhileMinimized) { IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
MAYBE_StopDrawingAttentionWhileMinimized) {
Panel* panel1 = CreatePanel("panel1"); Panel* panel1 = CreatePanel("panel1");
Panel* panel2 = CreatePanel("panel2"); Panel* panel2 = CreatePanel("panel2");
...@@ -1322,8 +1331,15 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DrawAttentionResetOnClick) { ...@@ -1322,8 +1331,15 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_DrawAttentionResetOnClick) {
panel2->Close(); panel2->Close();
} }
// http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_MinimizeImmediatelyAfterRestore \
DISABLED_MinimizeImmediatelyAfterRestore
#else
#define MAYBE_MinimizeImmediatelyAfterRestore MinimizeImmediatelyAfterRestore
#endif
IN_PROC_BROWSER_TEST_F(PanelBrowserTest, IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
MinimizeImmediatelyAfterRestore) { MAYBE_MinimizeImmediatelyAfterRestore) {
CreatePanelParams params("Panel Test", gfx::Rect(), SHOW_AS_ACTIVE); CreatePanelParams params("Panel Test", gfx::Rect(), SHOW_AS_ACTIVE);
Panel* panel = CreatePanelWithParams(params); Panel* panel = CreatePanelWithParams(params);
scoped_ptr<NativePanelTesting> native_panel_testing( scoped_ptr<NativePanelTesting> native_panel_testing(
......
...@@ -1076,7 +1076,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) { ...@@ -1076,7 +1076,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
panel_manager->CloseAll(); 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(); PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection(); DockedPanelCollection* docked_collection = panel_manager->docked_collection();
DetachedPanelCollection* detached_collection = DetachedPanelCollection* detached_collection =
...@@ -1136,7 +1142,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) { ...@@ -1136,7 +1142,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
panel_manager->CloseAll(); 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(); PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection(); DockedPanelCollection* docked_collection = panel_manager->docked_collection();
DetachedPanelCollection* detached_collection = DetachedPanelCollection* detached_collection =
...@@ -1254,7 +1266,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) { ...@@ -1254,7 +1266,13 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
panel_manager->CloseAll(); panel_manager->CloseAll();
} }
IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_DetachWithSqueeze DISABLED_DetachWithSqueeze
#else
#define MAYBE_DetachWithSqueeze DetachWithSqueeze
#endif
IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, MAYBE_DetachWithSqueeze) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
DockedPanelCollection* docked_collection = panel_manager->docked_collection(); DockedPanelCollection* docked_collection = panel_manager->docked_collection();
DetachedPanelCollection* detached_collection = DetachedPanelCollection* detached_collection =
...@@ -1336,8 +1354,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) { ...@@ -1336,8 +1354,8 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
panel_manager->CloseAll(); panel_manager->CloseAll();
} }
// http://crbug.com/143247 // http://crbug.com/143247, http://crbug.com/175760
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_MAC)
#define MAYBE_AttachWithSqueeze DISABLED_AttachWithSqueeze #define MAYBE_AttachWithSqueeze DISABLED_AttachWithSqueeze
#else #else
#define MAYBE_AttachWithSqueeze AttachWithSqueeze #define MAYBE_AttachWithSqueeze AttachWithSqueeze
......
...@@ -28,7 +28,13 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest { ...@@ -28,7 +28,13 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest {
} }
}; };
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_DockedPanelResizability DISABLED_DockedPanelResizability
#else
#define MAYBE_DockedPanelResizability DockedPanelResizability
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, MAYBE_DockedPanelResizability) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
Panel* panel = CreatePanel("Panel"); Panel* panel = CreatePanel("Panel");
...@@ -147,7 +153,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) { ...@@ -147,7 +153,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) {
panel->Close(); panel->Close();
} }
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_ResizeDetachedPanel DISABLED_ResizeDetachedPanel
#else
#define MAYBE_ResizeDetachedPanel ResizeDetachedPanel
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, MAYBE_ResizeDetachedPanel) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
...@@ -214,7 +226,15 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) { ...@@ -214,7 +226,15 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) {
PanelManager::GetInstance()->CloseAll(); PanelManager::GetInstance()->CloseAll();
} }
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_ResizeDetachedPanelToClampSize \
DISABLED_ResizeDetachedPanelToClampSize
#else
#define MAYBE_ResizeDetachedPanelToClampSize ResizeDetachedPanelToClampSize
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest,
MAYBE_ResizeDetachedPanelToClampSize) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
...@@ -259,7 +279,14 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) { ...@@ -259,7 +279,14 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) {
PanelManager::GetInstance()->CloseAll(); PanelManager::GetInstance()->CloseAll();
} }
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_CloseDetachedPanelOnResize DISABLED_CloseDetachedPanelOnResize
#else
#define MAYBE_CloseDetachedPanelOnResize CloseDetachedPanelOnResize
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest,
MAYBE_CloseDetachedPanelOnResize) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
PanelResizeController* resize_controller = panel_manager->resize_controller(); PanelResizeController* resize_controller = panel_manager->resize_controller();
DetachedPanelCollection* detached_collection = DetachedPanelCollection* detached_collection =
...@@ -322,7 +349,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) { ...@@ -322,7 +349,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) {
panel_manager->CloseAll(); panel_manager->CloseAll();
} }
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_ResizeAndCancel DISABLED_ResizeAndCancel
#else
#define MAYBE_ResizeAndCancel ResizeAndCancel
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, MAYBE_ResizeAndCancel) {
PanelManager* panel_manager = PanelManager::GetInstance(); PanelManager* panel_manager = PanelManager::GetInstance();
Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100)); Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
PanelResizeController* resize_controller = panel_manager->resize_controller(); PanelResizeController* resize_controller = panel_manager->resize_controller();
...@@ -367,7 +400,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) { ...@@ -367,7 +400,13 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) {
panel_manager->CloseAll(); panel_manager->CloseAll();
} }
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToTop) { // http://crbug.com/175760; several panel tests failing regularly on mac.
#if defined(OS_MAC)
#define MAYBE_ResizeDetachedPanelToTop DISABLED_ResizeDetachedPanelToTop
#else
#define MAYBE_ResizeDetachedPanelToTop ResizeDetachedPanelToTop
#endif
IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, MAYBE_ResizeDetachedPanelToTop) {
// Setup the test areas to have top-aligned bar excluded from work area. // Setup the test areas to have top-aligned bar excluded from work area.
const gfx::Rect primary_scren_area(0, 0, 800, 600); const gfx::Rect primary_scren_area(0, 0, 800, 600);
const gfx::Rect work_area(0, 10, 800, 590); const gfx::Rect work_area(0, 10, 800, 590);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment