summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 15:32:08 +0000
committergavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 15:32:08 +0000
commit27e5869f3b56908f1fe2df6c6d9c61393e75f1b7 (patch)
tree8751a2c2cfd8db98596089d40c320de9566aeaef /net
parent1078c634a72d8a3b2c0ad7dc934f950b101c27a9 (diff)
downloadchromium_src-27e5869f3b56908f1fe2df6c6d9c61393e75f1b7.zip
chromium_src-27e5869f3b56908f1fe2df6c6d9c61393e75f1b7.tar.gz
chromium_src-27e5869f3b56908f1fe2df6c6d9c61393e75f1b7.tar.bz2
Remove racy and unneeded CleanupCacheDir() calls.
The simple cache tests don't need to cleanup cache dir after dooming the entire cache; in fact it causes races with index creation. R=pasko@chromium.org, clamy@chromium.org BUG=333527 Review URL: https://codereview.chromium.org/136563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/disk_cache/entry_unittest.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 300c263..f9cb798 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -2352,7 +2352,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReleaseBuffer) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
ReleaseBuffer(i);
}
}
@@ -2374,7 +2373,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheGetTimes) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
GetTimes(i);
}
}
@@ -2384,7 +2382,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheGrowData) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
GrowData(i);
}
}
@@ -2394,7 +2391,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheTruncateData) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
TruncateData(i);
}
}
@@ -2404,7 +2400,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheZeroLengthIO) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
ZeroLengthIO(i);
}
}
@@ -2421,7 +2416,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReuseExternalEntry) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
ReuseEntry(20 * 1024, i);
}
}
@@ -2432,7 +2426,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReuseInternalEntry) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
ReuseEntry(10 * 1024, i);
}
}
@@ -2442,7 +2435,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheSizeChanges) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
SizeChanges(i);
}
}
@@ -2452,7 +2444,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheInvalidData) {
InitCache();
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
InvalidData(i);
}
}
@@ -2467,7 +2458,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReadWriteDestroyBuffer) {
InitCache();
for (int i = 1; i < disk_cache::kSimpleEntryStreamCount; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
ReadWriteDestroyBuffer(i);
}
}
@@ -2491,7 +2481,6 @@ TEST_F(DiskCacheEntryTest, SimpleCacheDoomedEntry) {
// it on a doomed entry, if it was previously lazily omitted.
for (int i = 0; i < disk_cache::kSimpleEntryStreamCount - 1; ++i) {
EXPECT_EQ(net::OK, DoomAllEntries());
- CleanupCacheDir();
DoomedEntry(i);
}
}