diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:34:36 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 22:34:36 +0000 |
| commit | ea8ec45f8d6091aa4f6983f52040dba61b264393 (patch) | |
| tree | c8c6bd41e7c6cf5928375bbaa8de7b27f85c4c77 /content | |
| parent | da57715a061535b0a0956bfeb536d9c5a80c10f0 (diff) | |
| download | chromium_src-ea8ec45f8d6091aa4f6983f52040dba61b264393.zip chromium_src-ea8ec45f8d6091aa4f6983f52040dba61b264393.tar.gz chromium_src-ea8ec45f8d6091aa4f6983f52040dba61b264393.tar.bz2 | |
Mark Tulip as flaky on Mac.
Tulip was incorrectly marked flaky on all platforms
due to an issue where #define and TEST_P don't interact
well (see issue 143151).
Also cleans up the disabled Flac test to use proper
DISABLED_ syntax instead of being commented out.
BUG=141020, 142896
TEST=media_browsertests.
Review URL: https://chromiumcodereview.appspot.com/10827384
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/media_browsertest.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc index 969b45f..2636d11 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)); |