Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up some of the files left after test runs #9539

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions db/blob/db_blob_basic_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ TEST_F(DBBlobBasicTest, MultiGetWithDirectIO) {
ASSERT_OK(statuses[2]);
ASSERT_EQ(values[2], second_blob);
}
ASSERT_OK(options.env->DeleteFile(file_path));
}
#endif // !ROCKSDB_LITE

Expand Down Expand Up @@ -594,6 +595,7 @@ TEST_F(DBBlobBasicTest, GenerateIOTracing) {
// Assuming blob files will have Append, Close and then Read operations.
ASSERT_GT(blob_files_op_count, 2);
}
ASSERT_OK(env_->DeleteFile(trace_file));
}
#endif // !ROCKSDB_LITE

Expand Down
6 changes: 6 additions & 0 deletions db/c_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,9 @@ int main(int argc, char** argv) {
CheckGet(db, roptions, "foo", "hello");

rocksdb_backup_engine_close(be);

rocksdb_destroy_db(options, dbbackupname, &err);
CheckNoError(err);
}

StartPhase("checkpoint");
Expand Down Expand Up @@ -687,6 +690,7 @@ int main(int argc, char** argv) {
CheckNoError(err);
rocksdb_delete(db, woptions, "sstk3", 5, &err);
CheckNoError(err);
remove(sstfilename);
}

StartPhase("writebatch");
Expand Down Expand Up @@ -2948,6 +2952,8 @@ int main(int argc, char** argv) {

StartPhase("cleanup");
rocksdb_close(db);
rocksdb_destroy_db(options, dbname, &err);
CheckNoError(err);
rocksdb_options_destroy(options);
rocksdb_block_based_options_destroy(table_options);
rocksdb_readoptions_destroy(roptions);
Expand Down
2 changes: 2 additions & 0 deletions db/column_family_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class ColumnFamilyTestBase : public testing::Test {
}
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
Destroy(column_families);
EXPECT_OK(DestroyDB(dbname_, Options(db_options_, column_family_options_)));
delete env_;
}

Expand Down Expand Up @@ -949,6 +950,7 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
}
}
}
ASSERT_OK(DestroyDir(env_, backup_logs));
}

#ifndef ROCKSDB_LITE // TEST functions used are not supported
Expand Down
Loading