Reenable flaky EncryptedMediaTest for investigation
These tests were flaky and disabled. But we have not been able to repro
the issue locally, nor understand the root cause of the issue.
Part of the problem is that the top part of the test log is truncated,
which has been fixed in a previous CL. Now we need to reproduce the test
failure to be able to examine the logs for investigation.
This CL reenables those flaky tests by reverting two CLs that disabled
those tests:
This reverts commit 9f4bee97412177c23c5dd050e2f268306f3b37c8.
Revert "Disable ECKEncryptedMediaTest.Renewal on linux asan"
This reverts commit b023b4e8692aff593728a98a5faae154e50b3da4.
Revert "Disable EncryptedMediaTest.Playback_VideoClearAudio_WebM on Linux asan"
[email protected],[email protected]
BUG=793426
Change-Id: I7441ccf1d89ea81d396ba0ab84a77eb41c9bf700
Reviewed-on: https://chromium-review.googlesource.com/823572
Reviewed-by: Xiaohan Wang <[email protected]>
Commit-Queue: Xiaohan Wang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#523688}diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 303d43c..5033f0b 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -581,15 +581,7 @@
TestSimplePlayback("bear-320x240-av_enc-av.webm", kWebMVorbisAudioVP8Video);
}
-// TODO(crbug.com/794102) Fix flakiness
-#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
-#define MAYBE_Playback_VideoClearAudio_WebM \
- DISABLED_Playback_VideoClearAudio_WebM
-#else
-#define MAYBE_Playback_VideoClearAudio_WebM Playback_VideoClearAudio_WebM
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
- MAYBE_Playback_VideoClearAudio_WebM) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMVorbisAudioVP8Video);
}
@@ -798,13 +790,7 @@
kUnitTestSuccess);
}
-// TODO(crbug.com/794039) Test is flaky on linux asan.
-#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
-#define MAYBE_Renewal DISABLED_Renewal
-#else
-#define MAYBE_Renewal Renewal
-#endif
-IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, MAYBE_Renewal) {
+IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, Renewal) {
TestPlaybackCase(kExternalClearKeyRenewalKeySystem, kNoSessionToLoad,
media::kEnded);
