Commit c5f22f68 authored by Robert Liao's avatar Robert Liao Committed by Commit Bot

Disable Flaky Fullscreen Entry Tests on Mac

BUG=824517
TBR=rdevlin.cronin@chromium.org
Disabling a test.

Change-Id: Ieead48926aad1ed9ced951e47a9ff114e4a8e8a1
Reviewed-on: https://chromium-review.googlesource.com/974313Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545079}
parent 8ace0e3a
...@@ -27,8 +27,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ExtensionFullscreenAccessPass) { ...@@ -27,8 +27,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ExtensionFullscreenAccessPass) {
ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_; ASSERT_TRUE(RunPlatformAppTest("fullscreen/has_permission")) << message_;
} }
#if defined(OS_MACOSX)
// Entering fullscreen is flaky on Mac: http://crbug.com/824517
#define MAYBE_FocusWindowDoesNotExitFullscreen \
DISABLED_FocusWindowDoesNotExitFullscreen
#else
#define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen
#endif
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
FocusWindowDoesNotExitFullscreen) { MAYBE_FocusWindowDoesNotExitFullscreen) {
browser()->exclusive_access_manager()->context()->EnterFullscreen( browser()->exclusive_access_manager()->context()->EnterFullscreen(
GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
ASSERT_TRUE(browser()->window()->IsFullscreen()); ASSERT_TRUE(browser()->window()->IsFullscreen());
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/macros.h" #include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h" #include "chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h"
...@@ -44,7 +45,13 @@ class FullscreenControlViewTest : public InProcessBrowserTest { ...@@ -44,7 +45,13 @@ class FullscreenControlViewTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(FullscreenControlViewTest); DISALLOW_COPY_AND_ASSIGN(FullscreenControlViewTest);
}; };
IN_PROC_BROWSER_TEST_F(FullscreenControlViewTest, MouseExitFullscreen) { #if defined(OS_MACOSX)
// Entering fullscreen is flaky on Mac: http://crbug.com/824517
#define MAYBE_MouseExitFullscreen DISABLED_MouseExitFullscreen
#else
#define MAYBE_MouseExitFullscreen MouseExitFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControlViewTest, MAYBE_MouseExitFullscreen) {
GURL blank_url("about:blank"); GURL blank_url("about:blank");
ui_test_utils::NavigateToURL(browser(), blank_url); ui_test_utils::NavigateToURL(browser(), blank_url);
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
......
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