diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 17:32:55 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 17:32:55 +0000 |
| commit | 1cd5881de55d7b557e7e308b9b2e7a2442c86a6e (patch) | |
| tree | a7acf7a1687026558956c053e4097160c4ae44af /net/disk_cache | |
| parent | 8a2373759abaa52eecea8a16b9eda6403884c9f3 (diff) | |
| download | chromium_src-1cd5881de55d7b557e7e308b9b2e7a2442c86a6e.zip chromium_src-1cd5881de55d7b557e7e308b9b2e7a2442c86a6e.tar.gz chromium_src-1cd5881de55d7b557e7e308b9b2e7a2442c86a6e.tar.bz2 | |
Disk cache: Re-enable some unit tests that were disabled
or marked as flaky.
BUG=21110,38562
TEST=unittests
Review URL: http://codereview.chromium.org/1800010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/backend_unittest.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 2430fc3..2297b9f 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -1301,8 +1301,7 @@ void DiskCacheBackendTest::BackendDisable2() { EXPECT_EQ(0, cache_->GetEntryCount()); } -// http://code.google.com/p/chromium/issues/detail?id=38562 -TEST_F(DiskCacheBackendTest, DISABLED_DisableSuccess2) { +TEST_F(DiskCacheBackendTest, DisableSuccess2) { ASSERT_TRUE(CopyTestCache(L"list_loop")); DisableFirstCleanup(); SetDirectMode(); @@ -1319,8 +1318,7 @@ TEST_F(DiskCacheBackendTest, NewEvictionDisableSuccess2) { BackendDisable2(); } -// http://code.google.com/p/chromium/issues/detail?id=38562 -TEST_F(DiskCacheBackendTest, DISABLED_DisableFailure2) { +TEST_F(DiskCacheBackendTest, DisableFailure2) { ASSERT_TRUE(CopyTestCache(L"list_loop")); DisableFirstCleanup(); SetDirectMode(); @@ -1329,8 +1327,7 @@ TEST_F(DiskCacheBackendTest, DISABLED_DisableFailure2) { BackendDisable2(); } -// http://code.google.com/p/chromium/issues/detail?id=38562 -TEST_F(DiskCacheBackendTest, DISABLED_NewEvictionDisableFailure2) { +TEST_F(DiskCacheBackendTest, NewEvictionDisableFailure2) { ASSERT_TRUE(CopyTestCache(L"list_loop")); DisableFirstCleanup(); SetDirectMode(); @@ -1357,8 +1354,7 @@ void DiskCacheBackendTest::BackendDisable3() { EXPECT_EQ(1, cache_->GetEntryCount()); } -// http://code.google.com/p/chromium/issues/detail?id=38562 -TEST_F(DiskCacheBackendTest, DISABLED_DisableSuccess3) { +TEST_F(DiskCacheBackendTest, DisableSuccess3) { ASSERT_TRUE(CopyTestCache(L"bad_rankings2")); DisableFirstCleanup(); SetMaxSize(20 * 1024 * 1024); @@ -1366,8 +1362,7 @@ TEST_F(DiskCacheBackendTest, DISABLED_DisableSuccess3) { BackendDisable3(); } -// http://code.google.com/p/chromium/issues/detail?id=38562 -TEST_F(DiskCacheBackendTest, DISABLED_NewEvictionDisableSuccess3) { +TEST_F(DiskCacheBackendTest, NewEvictionDisableSuccess3) { ASSERT_TRUE(CopyTestCache(L"bad_rankings2")); DisableFirstCleanup(); SetMaxSize(20 * 1024 * 1024); @@ -1432,9 +1427,7 @@ TEST_F(DiskCacheBackendTest, DisableSuccess4) { BackendDisable4(); } -// Flaky, http://crbug.com/21110. -// TODO(rvargas): Add more debugging code to help identify the root cause. -TEST_F(DiskCacheBackendTest, FLAKY_NewEvictionDisableSuccess4) { +TEST_F(DiskCacheBackendTest, NewEvictionDisableSuccess4) { ASSERT_TRUE(CopyTestCache(L"bad_rankings")); DisableFirstCleanup(); SetDirectMode(); |