diff options
| author | Victor Costan <costan@google.com> | 2023-03-28 20:17:45 -0700 |
|---|---|---|
| committer | Victor Costan <costan@google.com> | 2023-03-28 20:17:45 -0700 |
| commit | 9cbbc5fb75cbd512e6168c6f00691417cfcac2f0 (patch) | |
| tree | 53de35956e5bb69831be6675be4441a91202add6 | |
| parent | 80d858fb2a092cc79beaa04b7e9cbd23983e4f2c (diff) | |
| parent | 13ebad24dc1a5b338b619e8f1229105fbba3992f (diff) | |
| download | leveldb-9cbbc5fb75cbd512e6168c6f00691417cfcac2f0.tar.gz | |
Merge pull request #1104 from reillyeon:chromium_env
PiperOrigin-RevId: 520172744
| -rw-r--r-- | db/db_test.cc | 6 | ||||
| -rw-r--r-- | db/recovery_test.cc | 5 | ||||
| -rw-r--r-- | util/env_test.cc | 10 |
3 files changed, 21 insertions, 0 deletions
diff --git a/db/db_test.cc b/db/db_test.cc index 472258b..a4a84cd 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -1722,8 +1722,14 @@ TEST_F(DBTest, DestroyEmptyDir) { ASSERT_TRUE(env.FileExists(dbname)); std::vector<std::string> children; ASSERT_LEVELDB_OK(env.GetChildren(dbname, &children)); +#if defined(LEVELDB_PLATFORM_CHROMIUM) + // TODO(https://crbug.com/1428746): Chromium's file system abstraction always + // filters out '.' and '..'. + ASSERT_EQ(0, children.size()); +#else // The stock Env's do not filter out '.' and '..' special files. ASSERT_EQ(2, children.size()); +#endif // defined(LEVELDB_PLATFORM_CHROMIUM) ASSERT_LEVELDB_OK(DestroyDB(dbname, opts)); ASSERT_TRUE(!env.FileExists(dbname)); diff --git a/db/recovery_test.cc b/db/recovery_test.cc index 1d9f621..8dc039a 100644 --- a/db/recovery_test.cc +++ b/db/recovery_test.cc @@ -328,7 +328,12 @@ TEST_F(RecoveryTest, ManifestMissing) { RemoveManifestFile(); Status status = OpenWithStatus(); +#if defined(LEVELDB_PLATFORM_CHROMIUM) + // TODO(crbug.com/760362): See comment in MakeIOError() from env_chromium.cc. + ASSERT_TRUE(status.IsIOError()); +#else ASSERT_TRUE(status.IsCorruption()); +#endif // defined(LEVELDB_PLATFORM_CHROMIUM) } } // namespace leveldb diff --git a/util/env_test.cc b/util/env_test.cc index 4bdb89b..e5c30fe 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -180,11 +180,21 @@ TEST_F(EnvTest, TestOpenNonExistentFile) { RandomAccessFile* random_access_file; Status status = env_->NewRandomAccessFile(non_existent_file, &random_access_file); +#if defined(LEVELDB_PLATFORM_CHROMIUM) + // TODO(crbug.com/760362): See comment in MakeIOError() from env_chromium.cc. + ASSERT_TRUE(status.IsIOError()); +#else ASSERT_TRUE(status.IsNotFound()); +#endif // defined(LEVELDB_PLATFORM_CHROMIUM) SequentialFile* sequential_file; status = env_->NewSequentialFile(non_existent_file, &sequential_file); +#if defined(LEVELDB_PLATFORM_CHROMIUM) + // TODO(crbug.com/760362): See comment in MakeIOError() from env_chromium.cc. + ASSERT_TRUE(status.IsIOError()); +#else ASSERT_TRUE(status.IsNotFound()); +#endif // defined(LEVELDB_PLATFORM_CHROMIUM) } TEST_F(EnvTest, ReopenWritableFile) { |