Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Issue 823023002: Revert of Disable failing EncryptedMediaTest tests. (Closed)

Created:
6 years ago by Avi (use Gerrit)
Modified:
6 years ago
Reviewers:
eroman, dgozman
CC:
chromium-reviews, posciak+watch_chromium.org, feature-media-reviews_chromium.org, wjia+watch_chromium.org, mcasas+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Disable failing EncryptedMediaTest tests. (patchset #1 id:1 of https://codereview.chromium.org/821093006/) Reason for revert: I reverted the guilty commit; re-enabling the tests. Original issue's description: > Disable failing EncryptedMediaTest tests. > > BUG=444827 > TBR=eroman > NOTRY=true > > Committed: https://crrev.com/4353cae33756fd2fa4fd5384c9945943280345c7 > Cr-Commit-Position: refs/heads/master@{#309554} TBR=eroman@chromium.org,dgozman@chromium.org NOTREECHECKS=true NOTRY=true BUG=444827

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -19 lines) Patch
M chrome/browser/media/encrypted_media_browsertest.cc View 2 chunks +1 line, -19 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
Avi (use Gerrit)
Created Revert of Disable failing EncryptedMediaTest tests.
6 years ago (2014-12-23 21:24:32 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/823023002/1
6 years ago (2014-12-23 21:24:41 UTC) #2
commit-bot: I haz the power
6 years ago (2014-12-23 21:25:07 UTC) #4
Failed to apply patch for chrome/browser/media/encrypted_media_browsertest.cc:
While running git apply --index -3 -p1;
  error: patch failed: chrome/browser/media/encrypted_media_browsertest.cc:551
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/media/encrypted_media_browsertest.cc' with
conflicts.
  U chrome/browser/media/encrypted_media_browsertest.cc

Patch:       chrome/browser/media/encrypted_media_browsertest.cc
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc
b/chrome/browser/media/encrypted_media_browsertest.cc
index
5662efe4177c7a8e0253dff2c377be284104b94d..2000b687facc75b3fc90a11e7e013f3cdd2ce630
100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -551,22 +551,10 @@
   TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo);
 }
 
-// Fails on linux debug: http://crbug.com/444827.
-#if defined(OS_LINUX)
-#define MAYBE_Playback_VP9Video_WebM DISABLED_Playback_VP9Video_WebM
-#else
-#define MAYBE_Playback_VP9Video_WebM Playback_VP9Video_WebM
-#endif
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) {
   TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
 }
 
-// Fails on linux debug: http://crbug.com/444827.
-#if defined(OS_LINUX)
-#define MAYBE_Playback_AudioOnly_WebM_Opus
DISABLED_Playback_AudioOnly_WebM_Opus
-#else
-#define MAYBE_Playback_AudioOnly_WebM_Opus Playback_AudioOnly_WebM_Opus
-#endif
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) {
   TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
 }
@@ -595,13 +583,7 @@
   TestConfigChange();
 }
 
-// Fails on linux debug: http://crbug.com/444827.
-#if defined(OS_LINUX)
-#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
-#else
-#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
-#endif
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
   // Times out on Windows XP. http://crbug.com/171937
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_VISTA)

Powered by Google App Engine
This is Rietveld 408576698