summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-03 01:56:58 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-03 01:56:58 +0000
commit5ee1809cb5d7b80ba85b8fbb8aef342f32f6750e (patch)
tree3b8b6b687ccddd833c2a3c2e5a930851af4772e2
parent875288e14668d9dcb7e883a0b263d9b5b546740a (diff)
downloadchromium_src-5ee1809cb5d7b80ba85b8fbb8aef342f32f6750e.zip
chromium_src-5ee1809cb5d7b80ba85b8fbb8aef342f32f6750e.tar.gz
chromium_src-5ee1809cb5d7b80ba85b8fbb8aef342f32f6750e.tar.bz2
Mark two tests as flaky on Mac.
TBR=crogers@google.com BUG=95274 TEST=ExtensionResourceRequestPolicyTest.Video TEST=UILayoutTest.MediaUILayoutTest Review URL: http://codereview.chromium.org/7779025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99508 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_resource_request_policy_apitest.cc9
-rw-r--r--chrome/browser/media_uitest.cc9
2 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
index 397846a..e72986c 100644
--- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -104,7 +104,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Audio) {
"audio.html"));
}
-IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Video) {
+#if defined(OS_MACOSX)
+// http://crbug.com/95274 - Video is flaky on Mac.
+#define MAYBE_Video FLAKY_Video
+#else
+#define MAYBE_Video Video
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, MAYBE_Video) {
EXPECT_TRUE(RunExtensionSubtest(
"extension_resource_request_policy/extension2",
"video.html"));
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index e547970..d25f5df 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/95274 - 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",