diff options
| author | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 00:15:26 +0000 |
|---|---|---|
| committer | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 00:15:26 +0000 |
| commit | b1011efd52d46aa2224ab8f96dbf1ef39ea06231 (patch) | |
| tree | eb845d5e8bbe7484ee513a66a43fc7bc2d1ce709 /third_party | |
| parent | 3050436e88499e547c8f2fb7e0d34b921a306559 (diff) | |
| download | chromium_src-b1011efd52d46aa2224ab8f96dbf1ef39ea06231.zip chromium_src-b1011efd52d46aa2224ab8f96dbf1ef39ea06231.tar.gz chromium_src-b1011efd52d46aa2224ab8f96dbf1ef39ea06231.tar.bz2 | |
Fix a few windows file locking issues in env_chromium_unittests.
One just caused the temp dir to not be cleaned up. The other caused the test
to fail.
NOTRY=true
(These tests aren't run on the bots)
Review URL: https://codereview.chromium.org/33683002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/leveldatabase/env_chromium_unittest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/third_party/leveldatabase/env_chromium_unittest.cc b/third_party/leveldatabase/env_chromium_unittest.cc index 52895df..d110763 100644 --- a/third_party/leveldatabase/env_chromium_unittest.cc +++ b/third_party/leveldatabase/env_chromium_unittest.cc @@ -88,9 +88,10 @@ TEST(ChromiumEnv, DirectorySyncing) { std::string manifest_file_name = FilePathToString(dir_path.Append(FILE_PATH_LITERAL("MANIFEST-001"))); - WritableFile* manifest_file; - Status s = env.NewWritableFile(manifest_file_name, &manifest_file); + WritableFile* manifest_file_ptr; + Status s = env.NewWritableFile(manifest_file_name, &manifest_file_ptr); EXPECT_TRUE(s.ok()); + scoped_ptr<WritableFile> manifest_file(manifest_file_ptr); manifest_file->Append(data); EXPECT_EQ(0, env.directory_syncs()); manifest_file->Append(data); @@ -98,9 +99,10 @@ TEST(ChromiumEnv, DirectorySyncing) { std::string sst_file_name = FilePathToString(dir_path.Append(FILE_PATH_LITERAL("000003.sst"))); - WritableFile* sst_file; - s = env.NewWritableFile(sst_file_name, &sst_file); + WritableFile* sst_file_ptr; + s = env.NewWritableFile(sst_file_name, &sst_file_ptr); EXPECT_TRUE(s.ok()); + scoped_ptr<WritableFile> sst_file(sst_file_ptr); sst_file->Append(data); EXPECT_EQ(0, env.directory_syncs()); @@ -159,9 +161,9 @@ TEST(ChromiumEnv, BackupTables) { EXPECT_EQ(ldb_files, bak_files); base::FilePath ldb_file; EXPECT_TRUE(GetFirstLDBFile(dir, &ldb_file)); + delete db; EXPECT_TRUE(base::DeleteFile(ldb_file, false)); EXPECT_EQ(ldb_files - 1, CountFilesWithExtension(dir, FPL(".ldb"))); - delete db; // The ldb file deleted above should be restored in Open. status = leveldb::DB::Open(options, dir.AsUTF8Unsafe(), &db); |