diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 22:08:09 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 22:08:09 +0000 |
| commit | 1629eeeaa536ec7421deec5d6de78b6a871ad713 (patch) | |
| tree | 673120a730d03596dcab76a41d5aab7a993be397 /chrome/browser/rlz | |
| parent | 729b4851c4a3dc59e40f80b8798fa9253ee074a0 (diff) | |
| download | chromium_src-1629eeeaa536ec7421deec5d6de78b6a871ad713.zip chromium_src-1629eeeaa536ec7421deec5d6de78b6a871ad713.tar.gz chromium_src-1629eeeaa536ec7421deec5d6de78b6a871ad713.tar.bz2 | |
Disable ExtensionApiTest.Rlz which has become too flaky
TBR=rogerta@chromium.org
BUG=137834
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10829017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/rlz')
| -rw-r--r-- | chrome/browser/rlz/rlz_extension_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/rlz/rlz_extension_apitest.cc b/chrome/browser/rlz/rlz_extension_apitest.cc index 1679d90..8770522 100644 --- a/chrome/browser/rlz/rlz_extension_apitest.cc +++ b/chrome/browser/rlz/rlz_extension_apitest.cc @@ -46,7 +46,14 @@ ExtensionFunction* MockRlzSendFinancialPingFunctionFactory() { return new MockRlzSendFinancialPingFunction(); } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Rlz) { +// Mac is flaky - http://crbug.com/137834. +#if defined(OS_MACOSX) +#define MAYBE_Rlz DISABLED_Rlz +#else +#define MAYBE_Rlz Rlz +#endif + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Rlz) { // The default test resolver doesn't allow lookups to *.google.com. That // makes sense, but it does make RLZ's SendFinancialPing() fail -- so allow // connections to google.com in this test. |