diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 16:05:35 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 16:05:35 +0000 |
| commit | 7b17fdaab8d9e3b9cfacd0d1df313f7d343fb5cb (patch) | |
| tree | 33bd16e2ee30ea8ac6a1ff337d41cac3e54c7b24 /net | |
| parent | e7508d8c08925db094cbad5d3d96003fcbf64d5e (diff) | |
| download | chromium_src-7b17fdaab8d9e3b9cfacd0d1df313f7d343fb5cb.zip chromium_src-7b17fdaab8d9e3b9cfacd0d1df313f7d343fb5cb.tar.gz chromium_src-7b17fdaab8d9e3b9cfacd0d1df313f7d343fb5cb.tar.bz2 | |
Disable CookieMonsterTest.GarbageCollectionTriggers on Windows.
BUG=126095
Review URL: http://codereview.chromium.org/10349010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/cookies/cookie_monster_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index d2706a5..e7e3582 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -2076,7 +2076,15 @@ TEST_F(CookieMonsterTest, CookieListOrdering) { // 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_F(CookieMonsterTest, GarbageCollectionTriggers) { + +// Disabled on Windows, see crbug.com/126095 +#if defined(OS_WIN) +#define MAYBE_GarbageCollectionTriggers DISABLED_GarbageCollectionTriggers +#else +#define MAYBE_GarbageCollectionTriggers GarbageCollectionTriggers +#endif + +TEST_F(CookieMonsterTest, MAYBE_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. { |