Commit f2c84f00 authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Enable interactive_ui_tests on Windows that now run mostly reliably.

r516772 was the last of many commits that resolved a number of problems
that made this test suite flaky on Windows. This CL enables tests that
had been disabled over time due to flakes, yet now seem to run okay.

BUG=504054,764415
This CL was uploaded by git cl split.

R=lazyboy@chromium.org

Change-Id: Ibcd290d03dbfb923077ee542c24b06fdb9f21e2b
Reviewed-on: https://chromium-review.googlesource.com/784851Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519942}
parent 415212d7
...@@ -1011,14 +1011,7 @@ IN_PROC_BROWSER_TEST_P(WebViewNewWindowInteractiveTest, NewWindow_NoName) { ...@@ -1011,14 +1011,7 @@ IN_PROC_BROWSER_TEST_P(WebViewNewWindowInteractiveTest, NewWindow_NoName) {
NEEDS_TEST_SERVER); NEEDS_TEST_SERVER);
} }
// Flaky on win_chromium_rel_ng. https://crbug.com/504054 IN_PROC_BROWSER_TEST_P(WebViewNewWindowInteractiveTest, NewWindow_Redirect) {
#if defined(OS_WIN)
#define MAYBE_NewWindow_Redirect DISABLED_NewWindow_Redirect
#else
#define MAYBE_NewWindow_Redirect NewWindow_Redirect
#endif
IN_PROC_BROWSER_TEST_P(WebViewNewWindowInteractiveTest,
MAYBE_NewWindow_Redirect) {
TestHelper("testNewWindowRedirect", TestHelper("testNewWindowRedirect",
"web_view/newwindow", "web_view/newwindow",
NEEDS_TEST_SERVER); NEEDS_TEST_SERVER);
...@@ -1264,14 +1257,7 @@ IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, ExecuteCode) { ...@@ -1264,14 +1257,7 @@ IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, ExecuteCode) {
"platform_apps/web_view/common", "execute_code")) << message_; "platform_apps/web_view/common", "execute_code")) << message_;
} }
// Causes problems on windows: http://crbug.com/544037 IN_PROC_BROWSER_TEST_F(WebViewPopupInteractiveTest, PopupPositioningBasic) {
#if defined(OS_WIN)
#define MAYBE_PopupPositioningBasic DISABLED_PopupPositioningBasic
#else
#define MAYBE_PopupPositioningBasic PopupPositioningBasic
#endif
IN_PROC_BROWSER_TEST_F(WebViewPopupInteractiveTest,
MAYBE_PopupPositioningBasic) {
TestHelper("testBasic", "web_view/popup_positioning", NO_TEST_SERVER); TestHelper("testBasic", "web_view/popup_positioning", NO_TEST_SERVER);
ASSERT_TRUE(guest_web_contents()); ASSERT_TRUE(guest_web_contents());
PopupTestHelper(gfx::Point()); PopupTestHelper(gfx::Point());
...@@ -1281,8 +1267,7 @@ IN_PROC_BROWSER_TEST_F(WebViewPopupInteractiveTest, ...@@ -1281,8 +1267,7 @@ IN_PROC_BROWSER_TEST_F(WebViewPopupInteractiveTest,
} }
// Flaky on ChromeOS and Linux: http://crbug.com/526886 // Flaky on ChromeOS and Linux: http://crbug.com/526886
// Causes problems on windows: http://crbug.com/544998 #if defined(OS_CHROMEOS) || defined(OS_LINUX)
#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_PopupPositioningMoved DISABLED_PopupPositioningMoved #define MAYBE_PopupPositioningMoved DISABLED_PopupPositioningMoved
#else #else
#define MAYBE_PopupPositioningMoved PopupPositioningMoved #define MAYBE_PopupPositioningMoved PopupPositioningMoved
...@@ -1333,8 +1318,15 @@ IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, Navigation_BackForwardKeys) { ...@@ -1333,8 +1318,15 @@ IN_PROC_BROWSER_TEST_P(WebViewInteractiveTest, Navigation_BackForwardKeys) {
// Trips over a DCHECK in content::MouseLockDispatcher::OnLockMouseACK; see // Trips over a DCHECK in content::MouseLockDispatcher::OnLockMouseACK; see
// https://crbug.com/761783. // https://crbug.com/761783.
#if defined(OS_WIN)
#define MAYBE_PointerLock_PointerLockLostWithFocus \
PointerLock_PointerLockLostWithFocus
#else
#define MAYBE_PointerLock_PointerLockLostWithFocus \
DISABLED_PointerLock_PointerLockLostWithFocus
#endif
IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest, IN_PROC_BROWSER_TEST_P(WebViewPointerLockInteractiveTest,
DISABLED_PointerLock_PointerLockLostWithFocus) { MAYBE_PointerLock_PointerLockLostWithFocus) {
TestHelper("testPointerLockLostWithFocus", TestHelper("testPointerLockLostWithFocus",
"web_view/pointerlock", "web_view/pointerlock",
NO_TEST_SERVER); NO_TEST_SERVER);
......
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