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

Unified Diff: content/browser/media_browsertest.cc

Issue 10827384: Mark Tulip as flaky on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep flac test disabled :-/ Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media_browsertest.cc
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc
index 969b45ff2ef50668a14847ca7b27b5c3c67772c5..2636d11e2d6055d03f47a233576ad80d3424e95f 100644
--- a/content/browser/media_browsertest.cc
+++ b/content/browser/media_browsertest.cc
@@ -138,9 +138,9 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
}
// TODO(dalecurtis): Fails seek test. http://crbug.com/141020
-// IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
-// PlayAudio("bear.flac", GetParam());
-// }
+IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearFlac) {
+ PlayAudio("bear.flac", GetParam());
+}
#endif
#endif
@@ -148,10 +148,16 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
PlayAudio("bear_pcm.wav", GetParam());
}
-// Flaky. http://crbug.com/143151
+#if defined(OS_MACOSX)
+// TODO(dalecurtis): Flaky on Mac 10.6. http://crbug.com/142896
IN_PROC_BROWSER_TEST_P(MediaTest, FLAKY_VideoTulipWebm) {
PlayVideo("tulip2.webm", GetParam());
}
+#else
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
+ PlayVideo("tulip2.webm", GetParam());
+}
+#endif
INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698