diff options
| author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 20:34:48 +0000 |
|---|---|---|
| committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 20:34:48 +0000 |
| commit | 4329776454c79eab08647c7ea86268a5e1e4c1da (patch) | |
| tree | e42daf6cd1a0e06de6ae1e36e79d7e4dc116cc1d /chrome/browser/extensions | |
| parent | b12ed2fc8766a07fec27bc2dcad4b2ebaaa1bbdf (diff) | |
| download | chromium_src-4329776454c79eab08647c7ea86268a5e1e4c1da.zip chromium_src-4329776454c79eab08647c7ea86268a5e1e4c1da.tar.gz chromium_src-4329776454c79eab08647c7ea86268a5e1e4c1da.tar.bz2 | |
Temporarily disabled some browser tests that fail because of r53715 upstream.
BUG=33085
TEST=none
TBR=jorlow
Review URL: http://codereview.chromium.org/555080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index b6c3da8..83267c8 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -377,6 +377,21 @@ void GetParsedFeedData(HTTPTestServer* server, EXPECT_STREQ(expected_error.c_str(), error.c_str()); } +#if defined(OS_LINUX) +// http://crbug.com/33085 Temporarily disabled some browser tests +// that fail because of r53715 upstream. +#define ParseFeedValidFeed0 DISABLED_ParseFeedValidFeed0 +#define ParseFeedValidFeed1 DISABLED_ParseFeedValidFeed1 +#define ParseFeedValidFeed2 DISABLED_ParseFeedValidFeed2 +#define ParseFeedValidFeed3 DISABLED_ParseFeedValidFeed3 +#define ParseFeedValidFeed4 DISABLED_ParseFeedValidFeed4 +#define ParseFeedValidFeed5 DISABLED_ParseFeedValidFeed5 +#define ParseFeedValidFeedNoLinks DISABLED_ParseFeedValidFeedNoLinks +#define ParseFeedInvalidFeed1 DISABLED_ParseFeedInvalidFeed1 +#define ParseFeedInvalidFeed2 DISABLED_ParseFeedInvalidFeed2 +#define ParseFeedInvalidFeed3 DISABLED_ParseFeedInvalidFeed3 +#endif + IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) { HTTPTestServer* server = StartHTTPServer(); GetParsedFeedData(server, kValidFeed1, browser(), |