diff options
Diffstat (limited to 'db/db_flush_test.cc')
-rw-r--r-- | db/db_flush_test.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/db/db_flush_test.cc b/db/db_flush_test.cc index 496cedfa1..df8108463 100644 --- a/db/db_flush_test.cc +++ b/db/db_flush_test.cc @@ -451,7 +451,6 @@ TEST_F(DBFlushTest, FlushWithBlob) { constexpr uint64_t min_blob_size = 10; Options options; - options.env = CurrentOptions().env; options.enable_blob_files = true; options.min_blob_size = min_blob_size; options.disable_auto_compactions = true; @@ -528,11 +527,8 @@ TEST_F(DBFlushTest, FlushWithBlob) { class DBFlushTestBlobError : public DBFlushTest, public testing::WithParamInterface<std::string> { public: - DBFlushTestBlobError() - : fault_injection_env_(env_), sync_point_(GetParam()) {} - ~DBFlushTestBlobError() { Close(); } + DBFlushTestBlobError() : sync_point_(GetParam()) {} - FaultInjectionTestEnv fault_injection_env_; std::string sync_point_; }; @@ -545,20 +541,18 @@ TEST_P(DBFlushTestBlobError, FlushError) { Options options; options.enable_blob_files = true; options.disable_auto_compactions = true; - options.env = &fault_injection_env_; + options.env = env_; Reopen(options); ASSERT_OK(Put("key", "blob")); - SyncPoint::GetInstance()->SetCallBack(sync_point_, [this](void* /* arg */) { - fault_injection_env_.SetFilesystemActive(false, - Status::IOError(sync_point_)); + SyncPoint::GetInstance()->SetCallBack(sync_point_, [this](void* arg) { + Status* const s = static_cast<Status*>(arg); + assert(s); + + (*s) = Status::IOError(sync_point_); }); - SyncPoint::GetInstance()->SetCallBack( - "BuildTable:BeforeDeleteFile", [this](void* /* arg */) { - fault_injection_env_.SetFilesystemActive(true); - }); SyncPoint::GetInstance()->EnableProcessing(); ASSERT_NOK(Flush()); |