Commit 92f6386d authored by Arthur Sonzogni's avatar Arthur Sonzogni Committed by Commit Bot

Revert "🤠 Disabling flaky MediaCanPlayTypeTest for Android"

This reverts commit 183d178c.

Reason for revert: Test aren't flaky anymore on trunk. They are flaky
only on the m-84 branch.

Original change's description:
> 🤠 Disabling flaky MediaCanPlayTypeTest for Android
> 
> MediaCanPlayTypeTest.CodecSupportTest_HLS
> MediaCanPlayTypeTest.CodecSupportTest_mp3
> MediaCanPlayTypeTest.CodecSupportTest_mp4
> 
> TBR=dalecurtis
> 
> Bug: 1090770
> Change-Id: I484d9840b343386f696d563aab3182219a69822f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310536
> Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#790767}

TBR=dalecurtis@chromium.org,arthursonzogni@chromium.org

Change-Id: Ic7f132acd8d636875f935a874d03d1f36c7de1ed
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1090770
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315677Reviewed-by: default avatarArthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791171}
parent b74492d3
...@@ -73,23 +73,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_flac) { ...@@ -73,23 +73,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_flac) {
ExecuteTest("testFlacVariants()"); ExecuteTest("testFlacVariants()");
} }
// Flaky on Marshmallow. https://crbug.com/1090770 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) {
#if defined(OS_ANDROID)
#define MAYBE_CodecSupportTest_mp3 DISABLED_CodecSupportTest_mp3
#else
#define MAYBE_CodecSupportTest_mp3 CodecSupportTest_mp3
#endif
IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, MAYBE_CodecSupportTest_mp3) {
ExecuteTest("testMp3Variants()"); ExecuteTest("testMp3Variants()");
} }
// Flaky on Marshmallow. https://crbug.com/1090770 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
#if defined(OS_ANDROID)
#define MAYBE_CodecSupportTest_mp4 DISABLED_CodecSupportTest_mp4
#else
#define MAYBE_CodecSupportTest_mp4 CodecSupportTest_mp4
#endif
IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, MAYBE_CodecSupportTest_mp4) {
#if BUILDFLAG(USE_PROPRIETARY_CODECS) #if BUILDFLAG(USE_PROPRIETARY_CODECS)
ExecuteTest("testMp4Variants(true)"); // has_proprietary_codecs=true ExecuteTest("testMp4Variants(true)"); // has_proprietary_codecs=true
#else #else
...@@ -145,17 +133,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mp4aVariants) { ...@@ -145,17 +133,11 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mp4aVariants) {
#endif #endif
} }
// Flaky on Marshmallow. https://crbug.com/1090770 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
#if defined(OS_ANDROID)
#define MAYBE_CodecSupportTest_HLS DISABLED_CodecSupportTest_HLS
#else
#define MAYBE_CodecSupportTest_HLS CodecSupportTest_HLS
#endif
IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, MAYBE_CodecSupportTest_HLS) {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
ExecuteTest("testHls(true)"); // has_hls_support=true ExecuteTest("testHls(true)"); // has_hls_support=true
#else #else
ExecuteTest("testHls(false)"); // has_hls_support=false ExecuteTest("testHls(false)"); // has_hls_support=false
#endif #endif
} }
......
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