diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 11:47:29 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 11:47:29 +0000 |
| commit | 3cc5922dbc5f1668bc1cd4f691286c5a7218c167 (patch) | |
| tree | 4acd9b73dc5f6ab0c0a6aa2da482d2fd6948816f /net/disk_cache/storage_block_unittest.cc | |
| parent | c86d350e584b00bd5df71e82b5774ef245a14bef (diff) | |
| download | chromium_src-3cc5922dbc5f1668bc1cd4f691286c5a7218c167.zip chromium_src-3cc5922dbc5f1668bc1cd4f691286c5a7218c167.tar.gz chromium_src-3cc5922dbc5f1668bc1cd4f691286c5a7218c167.tar.bz2 | |
Revert 60165 - GTTF: Make net_unittests run successfully with parallel test launcher
by using a unique directory for disk cache tests.
BUG=54098
TEST=run net_unittests using tools/parallel_launcher/parallel_launcher.py
Review URL: http://codereview.chromium.org/3410008
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3387012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/storage_block_unittest.cc')
| -rw-r--r-- | net/disk_cache/storage_block_unittest.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/disk_cache/storage_block_unittest.cc b/net/disk_cache/storage_block_unittest.cc index abaa4a7..c9406b6 100644 --- a/net/disk_cache/storage_block_unittest.cc +++ b/net/disk_cache/storage_block_unittest.cc @@ -10,9 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" TEST_F(DiskCacheTest, StorageBlock_LoadStore) { - ScopedTestCache test_cache; - FilePath filename = test_cache.path().AppendASCII("a_test"); - + FilePath filename = GetCacheFilePath().AppendASCII("a_test"); scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile); ASSERT_TRUE(CreateCacheTestFile(filename)); ASSERT_TRUE(file->Init(filename, 8192)); @@ -32,9 +30,7 @@ TEST_F(DiskCacheTest, StorageBlock_LoadStore) { } TEST_F(DiskCacheTest, StorageBlock_SetData) { - ScopedTestCache test_cache; - FilePath filename = test_cache.path().AppendASCII("a_test"); - + FilePath filename = GetCacheFilePath().AppendASCII("a_test"); scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile); ASSERT_TRUE(CreateCacheTestFile(filename)); ASSERT_TRUE(file->Init(filename, 8192)); @@ -54,9 +50,7 @@ TEST_F(DiskCacheTest, StorageBlock_SetData) { } TEST_F(DiskCacheTest, StorageBlock_SetModified) { - ScopedTestCache test_cache; - FilePath filename = test_cache.path().AppendASCII("a_test"); - + FilePath filename = GetCacheFilePath().AppendASCII("a_test"); scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile); ASSERT_TRUE(CreateCacheTestFile(filename)); ASSERT_TRUE(file->Init(filename, 8192)); |