summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 22:31:51 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 22:31:51 +0000
commitef8e4a9e94d468391d900391ac7f608a4aa072bc (patch)
tree7fc0fc8ef4ee534162bbf276a9d10fa91ea900f3 /net
parentf71fb6fe8f9b650051865571b6293ec6e3b5c28c (diff)
downloadchromium_src-ef8e4a9e94d468391d900391ac7f608a4aa072bc.zip
chromium_src-ef8e4a9e94d468391d900391ac7f608a4aa072bc.tar.gz
chromium_src-ef8e4a9e94d468391d900391ac7f608a4aa072bc.tar.bz2
Mark CookieMonsterTest.GarbageCollectionTriggers as FLAKY.
BUG=60015 Review URL: http://codereview.chromium.org/4016001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/cookie_monster_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc
index f4cca57..80d58ed 100644
--- a/net/base/cookie_monster_unittest.cc
+++ b/net/base/cookie_monster_unittest.cc
@@ -1953,7 +1953,8 @@ static net::CookieMonster* CreateMonsterForGC(int num_cookies) {
// get rid of cookies when we should). The perftest is probing for
// whether garbage collection happens when it shouldn't. See comments
// before that test for more details.
-TEST(CookieMonsterTest, GarbageCollectionTriggers) {
+// Flaky as per http://crbug.com/60015
+TEST(CookieMonsterTest, FLAKY_GarbageCollectionTriggers) {
// First we check to make sure that a whole lot of recent cookies
// doesn't get rid of anything after garbage collection is checked for.
{