Commit de619548 authored by Wei Li's avatar Wei Li Committed by Commit Bot

Re-enable fullscreen interactive tests

These tests were flaky before, but have been stable recently. We should
enable them to capture problems.

BUG=146006

Change-Id: I909a5e09ad5107a97ba18aef0ffb572928bfdc7c
Reviewed-on: https://chromium-review.googlesource.com/c/1332927Reviewed-by: default avatarMatt Giuca <mgiuca@chromium.org>
Commit-Queue: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607649}
parent 574cfe41
......@@ -122,14 +122,8 @@ void FullscreenControllerInteractiveTest::ToggleTabFullscreen_Internal(
// Tests ///////////////////////////////////////////////////////////////////////
// Tests that while in fullscreen creating a new tab will exit fullscreen.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen
#else
#define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestNewTabExitsFullscreen) {
TestNewTabExitsFullscreen) {
ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
......@@ -145,15 +139,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests a tab exiting fullscreen will bring the browser out of fullscreen.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestTabExitsItselfFromFullscreen TestTabExitsItselfFromFullscreen
#else
#define MAYBE_TestTabExitsItselfFromFullscreen \
DISABLED_TestTabExitsItselfFromFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabExitsItselfFromFullscreen) {
TestTabExitsItselfFromFullscreen) {
ASSERT_TRUE(embedded_test_server()->Start());
AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
......@@ -163,14 +150,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_BrowserFullscreenExit BrowserFullscreenExit
#else
#define MAYBE_BrowserFullscreenExit DISABLED_BrowserFullscreenExit
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_BrowserFullscreenExit) {
BrowserFullscreenExit) {
// Enter browser fullscreen.
ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
......@@ -184,15 +165,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests Browser Fullscreen remains active after Tab mode entered and exited.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_BrowserFullscreenAfterTabFSExit BrowserFullscreenAfterTabFSExit
#else
#define MAYBE_BrowserFullscreenAfterTabFSExit \
DISABLED_BrowserFullscreenAfterTabFSExit
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_BrowserFullscreenAfterTabFSExit) {
BrowserFullscreenAfterTabFSExit) {
// Enter browser fullscreen.
ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
......@@ -206,14 +180,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests fullscreen entered without permision prompt for file:// urls.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_FullscreenFileURL FullscreenFileURL
#else
#define MAYBE_FullscreenFileURL DISABLED_FullscreenFileURL
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_FullscreenFileURL) {
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, FullscreenFileURL) {
ui_test_utils::NavigateToURL(
browser(), ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory),
......@@ -225,16 +192,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests fullscreen is exited on page navigation.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestTabExitsFullscreenOnNavigation \
TestTabExitsFullscreenOnNavigation
#else
#define MAYBE_TestTabExitsFullscreenOnNavigation \
DISABLED_TestTabExitsFullscreenOnNavigation
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabExitsFullscreenOnNavigation) {
TestTabExitsFullscreenOnNavigation) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
......@@ -245,15 +204,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests fullscreen is exited when navigating back.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestTabExitsFullscreenOnGoBack TestTabExitsFullscreenOnGoBack
#else
#define MAYBE_TestTabExitsFullscreenOnGoBack \
DISABLED_TestTabExitsFullscreenOnGoBack
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabExitsFullscreenOnGoBack) {
TestTabExitsFullscreenOnGoBack) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
......@@ -267,16 +219,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests fullscreen is not exited on sub frame navigation.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation \
TestTabDoesntExitFullscreenOnSubFrameNavigation
#else
#define MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation \
DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_TestTabDoesntExitFullscreenOnSubFrameNavigation) {
TestTabDoesntExitFullscreenOnSubFrameNavigation) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL url(ui_test_utils::GetTestUrl(base::FilePath(
......@@ -290,17 +234,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests tab fullscreen exits, but browser fullscreen remains, on navigation.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \
TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks
#else
#define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \
DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks
#endif
IN_PROC_BROWSER_TEST_F(
FullscreenControllerInteractiveTest,
MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) {
TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
......@@ -378,15 +314,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) {
}
// Tests mouse lock and fullscreen modes can be escaped with ESC key.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_EscapingMouseLockAndFullscreen EscapingMouseLockAndFullscreen
#else
#define MAYBE_EscapingMouseLockAndFullscreen \
DISABLED_EscapingMouseLockAndFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_EscapingMouseLockAndFullscreen) {
EscapingMouseLockAndFullscreen) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
......@@ -414,14 +343,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests mouse lock then fullscreen.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_MouseLockThenFullscreen MouseLockThenFullscreen
#else
#define MAYBE_MouseLockThenFullscreen DISABLED_MouseLockThenFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_MouseLockThenFullscreen) {
MouseLockThenFullscreen) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
......@@ -484,15 +407,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
// Tests mouse lock and fullscreen for the privileged fullscreen case (e.g.,
// embedded flash fullscreen, since the Flash plugin handles user permissions
// requests itself).
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_PrivilegedMouseLockAndFullscreen PrivilegedMouseLockAndFullscreen
#else
#define MAYBE_PrivilegedMouseLockAndFullscreen \
DISABLED_PrivilegedMouseLockAndFullscreen
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_PrivilegedMouseLockAndFullscreen) {
PrivilegedMouseLockAndFullscreen) {
ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML));
......@@ -736,14 +652,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
}
// Tests ToggleFullscreenModeForTab always causes window to change.
// Test is flaky: http://crbug.com/146006
#if defined(OS_WIN)
#define MAYBE_ToggleFullscreenModeForTab ToggleFullscreenModeForTab
#else
#define MAYBE_ToggleFullscreenModeForTab DISABLED_ToggleFullscreenModeForTab
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
MAYBE_ToggleFullscreenModeForTab) {
ToggleFullscreenModeForTab) {
// Most fullscreen tests run sharded in fullscreen_controller_browsertest.cc
// but flakiness required a while loop in
// FullscreenControllerTest::ToggleTabFullscreen. This test verifies that
......
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