diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 08:39:17 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 08:39:17 +0000 |
| commit | da8a9632f03b1a6c053f0eb51cbe476cc8fcad0c (patch) | |
| tree | 5e773b9c9c92e942bf8a18f7c1a4b284ee0da15c | |
| parent | eb0b24e6cd9c7f6cb6a8274d9a2fe490edb3f401 (diff) | |
| download | chromium_src-da8a9632f03b1a6c053f0eb51cbe476cc8fcad0c.zip chromium_src-da8a9632f03b1a6c053f0eb51cbe476cc8fcad0c.tar.gz chromium_src-da8a9632f03b1a6c053f0eb51cbe476cc8fcad0c.tar.bz2 | |
Mark UILayoutTest.MediaUILayoutTest flaky on Mac
BUG=84463
TEST=UILayoutTest.MediaUILayoutTest
TBR=imcheng,mirandac
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87285 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/media_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index a07bd63..e344d0b 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -107,7 +107,14 @@ TEST_F(MediaTest, MAYBE_VideoBearWav) { PlayVideo("bear.wav"); } -TEST_F(UILayoutTest, MediaUILayoutTest) { +#if defined(OS_MACOSX) +// http://crbug.com/84463 - MediaUILayoutTest is flaky on Mac. +#define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest +#else +#define MAYBE_MediaUILayoutTest MediaUILayoutTest +#endif + +TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) { static const char* kResources[] = { "content", "media-file.js", |