summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:08:47 +0000
committerannacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:08:47 +0000
commit7d715b153711d68b134915f564be4b77d0ce77c3 (patch)
treec775ca6a323a7e61510a04a2f48c7ce8c81bbb5d /chrome
parent7802fa27c62746441727c28bcde9f8df60487172 (diff)
downloadchromium_src-7d715b153711d68b134915f564be4b77d0ce77c3.zip
chromium_src-7d715b153711d68b134915f564be4b77d0ce77c3.tar.gz
chromium_src-7d715b153711d68b134915f564be4b77d0ce77c3.tar.bz2
Unmark VideoBearWebm, VideoBearTheora, and VideoBearWav as flaky on Mac.
This flakiness was fixed with r87616 so unmarking the test as flaky. BUG=84170 TEST=MediaTest.VideoBearWebm, MediaTest.VideoBearTheora, and MediaTest.VideoBearWav Review URL: http://codereview.chromium.org/7054051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/media_uitest.cc18
1 files changed, 3 insertions, 15 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index a07bd63..89ac5290 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -65,19 +65,7 @@ class MediaTest : public UITest {
}
};
-#if defined(OS_MACOSX)
-// http://crbug.com/84170 - VideoBearTheora, VideoBearWav and VideoBearWebm
-// are flaky on Mac.
-#define MAYBE_VideoBearTheora FLAKY_VideoBearTheora
-#define MAYBE_VideoBearWav FLAKY_VideoBearWav
-#define MAYBE_VideoBearWebm FLAKY_VideoBearWebm
-#else
-#define MAYBE_VideoBearTheora VideoBearTheora
-#define MAYBE_VideoBearWav VideoBearWav
-#define MAYBE_VideoBearWebm VideoBearWebm
-#endif
-
-TEST_F(MediaTest, MAYBE_VideoBearTheora) {
+TEST_F(MediaTest, VideoBearTheora) {
PlayVideo("bear.ogv");
}
@@ -85,7 +73,7 @@ TEST_F(MediaTest, VideoBearSilentTheora) {
PlayVideo("bear_silent.ogv");
}
-TEST_F(MediaTest, MAYBE_VideoBearWebm) {
+TEST_F(MediaTest, VideoBearWebm) {
PlayVideo("bear.webm");
}
@@ -103,7 +91,7 @@ TEST_F(MediaTest, VideoBearSilentMp4) {
}
#endif
-TEST_F(MediaTest, MAYBE_VideoBearWav) {
+TEST_F(MediaTest, VideoBearWav) {
PlayVideo("bear.wav");
}