summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 14:20:07 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 14:20:07 +0000
commitf128972aef2bd4e3d6510f60b4ed3db21bb09e4c (patch)
tree8f20ac60ed6964eee5937a91ce478f0ca01af7ef
parentb7800c02ff34517e99a7ce2eaa58689f77a1b877 (diff)
downloadchromium_src-f128972aef2bd4e3d6510f60b4ed3db21bb09e4c.zip
chromium_src-f128972aef2bd4e3d6510f60b4ed3db21bb09e4c.tar.gz
chromium_src-f128972aef2bd4e3d6510f60b4ed3db21bb09e4c.tar.bz2
Flagging as flaky again, they like to fail with some frequency on Chromium XP but not the testers.
TBR=finnur@chromium.org TEST=none BUG=23686 Review URL: http://codereview.chromium.org/284011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29271 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 4900aae..88240b5 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -313,7 +313,7 @@ void GetParsedFeedData(Browser* browser, std::string* feed_title,
// Tests that we can parse valid feeds.
// This test was originally one big test that kept timing out because there is
// an overall timeout per browser tests. It was then split up into multiple.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeeds1) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, FLAKY_ParseFeedValidFeeds1) {
HTTPTestServer* server = StartHTTPServer();
std::string feed_title;
@@ -354,7 +354,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeeds1) {
// Tests that we can parse valid feeds.
// This test was originally one big test that kept timing out because there is
// an overall timeout per browser tests. It was then split up into multiple.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeeds2) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, FLAKY_ParseFeedValidFeeds2) {
HTTPTestServer* server = StartHTTPServer();
std::string feed_title;