diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 22:46:46 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 22:46:46 +0000 |
| commit | f354affaefcde4752c6a61a7f59fd6c13783971f (patch) | |
| tree | 2d5401554c58a60a964116521f9eea5ee7a93a29 /chrome | |
| parent | b507ff57fff61c3b525e62c1166ce3417fbd26df (diff) | |
| download | chromium_src-f354affaefcde4752c6a61a7f59fd6c13783971f.zip chromium_src-f354affaefcde4752c6a61a7f59fd6c13783971f.tar.gz chromium_src-f354affaefcde4752c6a61a7f59fd6c13783971f.tar.bz2 | |
Mark ExtensionApiTest.CrossOriginXHRFileAccess flaky on Mac.
BUG=105179
TBR=mihaip@chromium.org
Review URL: http://codereview.chromium.org/8663001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/cross_origin_xhr_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc index 7f67897..7909019 100644 --- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc +++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc @@ -23,7 +23,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRContentScript) { ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/content_script")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRFileAccess) { +// Flaky on Mac 10.5, crbug.com/105179. +#if defined(OS_MACOSX) +#define MAYBE_CrossOriginXHRFileAccess FLAKY_CrossOriginXHRFileAccess +#else +#define MAYBE_CrossOriginXHRFileAccess CrossOriginXHRFileAccess +#endif + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CrossOriginXHRFileAccess) { ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/file_access")) << message_; } |