Commit c49ced8b authored by Francois Beaufort's avatar Francois Beaufort Committed by Commit Bot

[Picture-in-Picture] Re-enable flaky tests

This CL aims to check which Picture-in-Picture browser tests are still
flaky. Note that after 4 runs of the CQ, none failed. It's likely that
the source of the failure was fixed when Picture-in-Picture logic
was moved to the PictureInPictureWindowControllerImpl.

Bug: 1001538, 1002489, 1070810, 1058087
Change-Id: Iac75b3731b4785aacff0fbaf102593a27f922970
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2475058Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#824354}
parent 3803ad75
...@@ -330,7 +330,6 @@ class PictureInPicturePixelComparisonBrowserTest ...@@ -330,7 +330,6 @@ class PictureInPicturePixelComparisonBrowserTest
std::unique_ptr<SkBitmap> result_bitmap_; std::unique_ptr<SkBitmap> result_bitmap_;
}; };
// TODO(cliffordcheng): enable on Windows when compile errors are resolved.
// Plays a video and then trigger Picture-in-Picture. Grabs a screenshot of // Plays a video and then trigger Picture-in-Picture. Grabs a screenshot of
// Picture-in-Picture window and verifies it's as expected. // Picture-in-Picture window and verifies it's as expected.
IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) { IN_PROC_BROWSER_TEST_F(PictureInPicturePixelComparisonBrowserTest, VideoPlay) {
...@@ -1335,9 +1334,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, ...@@ -1335,9 +1334,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
// Tests that when a new surface id is sent to the Picture-in-Picture window, it // Tests that when a new surface id is sent to the Picture-in-Picture window, it
// doesn't move back to its default position. // doesn't move back to its default position.
// crbug.com/1002489: disabled due to flakiness.
IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
DISABLED_SurfaceIdChangeDoesNotMoveWindow) { SurfaceIdChangeDoesNotMoveWindow) {
LoadTabAndEnterPictureInPicture( LoadTabAndEnterPictureInPicture(
browser(), base::FilePath(kPictureInPictureWindowSizePage)); browser(), base::FilePath(kPictureInPictureWindowSizePage));
...@@ -1621,9 +1619,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, ...@@ -1621,9 +1619,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
// Tests that video in Picture-in-Picture is paused when user presses // Tests that video in Picture-in-Picture is paused when user presses
// VKEY_MEDIA_PLAY_PAUSE key even if there's another media playing in a // VKEY_MEDIA_PLAY_PAUSE key even if there's another media playing in a
// foreground tab. // foreground tab.
// TODO(https://crbug.com/1070810) flaky test
IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
DISABLED_HandleMediaKeyPlayPause) { HandleMediaKeyPlayPause) {
GURL test_page_url = ui_test_utils::GetTestUrl( GURL test_page_url = ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory), base::FilePath(base::FilePath::kCurrentDirectory),
base::FilePath(kPictureInPictureWindowSizePage)); base::FilePath(kPictureInPictureWindowSizePage));
...@@ -2650,11 +2647,10 @@ IN_PROC_BROWSER_TEST_F( ...@@ -2650,11 +2647,10 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_TRUE(in_picture_in_picture); EXPECT_TRUE(in_picture_in_picture);
} }
// TODO(http://crbug/1001249): flaky.
// Check that Auto Picture-in-Picture applies only to the video element whose // Check that Auto Picture-in-Picture applies only to the video element whose
// autoPictureInPicture attribute was set most recently // autoPictureInPicture attribute was set most recently
IN_PROC_BROWSER_TEST_F(WebAppPictureInPictureWindowControllerBrowserTest, IN_PROC_BROWSER_TEST_F(WebAppPictureInPictureWindowControllerBrowserTest,
DISABLED_AutoPictureInPictureAttributeApplies) { AutoPictureInPictureAttributeApplies) {
InstallAndLaunchPWA(main_url()); InstallAndLaunchPWA(main_url());
bool result = false; bool result = false;
ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents(), ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents(),
...@@ -2896,14 +2892,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, ...@@ -2896,14 +2892,8 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
ExpectLeavePictureInPicture(active_web_contents); ExpectLeavePictureInPicture(active_web_contents);
} }
// TODO(crbug.com/1002489): Test is flaky on Linux.
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_UpdateMaxSize DISABLED_UpdateMaxSize
#else
#define MAYBE_UpdateMaxSize UpdateMaxSize
#endif
IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
MAYBE_UpdateMaxSize) { UpdateMaxSize) {
LoadTabAndEnterPictureInPicture( LoadTabAndEnterPictureInPicture(
browser(), base::FilePath(kPictureInPictureWindowSizePage)); browser(), base::FilePath(kPictureInPictureWindowSizePage));
......
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