From 64539ed2af6b2e3d9640a5ec93692dc07199a2e8 Mon Sep 17 00:00:00 2001 From: "Paulo E. Castro" Date: Sat, 16 Nov 2024 11:32:20 +0000 Subject: [PATCH] rgw: Make test idempotent. Give it a new DB name for each test so we don't get failures on rerun. Signed-off-by: Paulo E. Castro --- src/rgw/driver/dbstore/README.md | 4 ++-- src/rgw/driver/dbstore/tests/dbstore_tests.cc | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/rgw/driver/dbstore/README.md b/src/rgw/driver/dbstore/README.md index e8fdab7e5bd..bcde79a2891 100644 --- a/src/rgw/driver/dbstore/README.md +++ b/src/rgw/driver/dbstore/README.md @@ -40,8 +40,8 @@ The location and prefix for the database files can be configured using the follo To execute DBStore unit test cases (using Gtest framework), from build directory ninja unittest_dbstore_tests - ./bin/unittest_dbstore_tests [logfile] [loglevel] - (default logfile: rgw_dbstore_tests.log, loglevel: 20) + ./bin/unittest_dbstore_tests [logfile] [loglevel] [tenantname] + (default logfile: rgw_dbstore_tests.log, loglevel: 20, default_ns_) ninja unittest_dbstore_mgr_tests ./bin/unittest_dbstore_mgr_tests diff --git a/src/rgw/driver/dbstore/tests/dbstore_tests.cc b/src/rgw/driver/dbstore/tests/dbstore_tests.cc index d63a5728c50..554c4d29382 100644 --- a/src/rgw/driver/dbstore/tests/dbstore_tests.cc +++ b/src/rgw/driver/dbstore/tests/dbstore_tests.cc @@ -1385,12 +1385,14 @@ int main(int argc, char **argv) int ret = -1; string c_logfile = "rgw_dbstore_tests.log"; int c_loglevel = 20; + string c_tenant = "default_ns_" + std::to_string(time(NULL)); - // format: ./dbstore-tests logfile loglevel - if (argc == 3) { + // format: ./dbstore-tests logfile loglevel tenantname + if (argc == 4) { c_logfile = argv[1]; c_loglevel = (atoi)(argv[2]); - cout << "logfile:" << c_logfile << ", loglevel set to " << c_loglevel << "\n"; + c_tenant = argv[3]; + cout << "logfile:" << c_logfile << ", loglevel set to " << c_loglevel << ", db is " << c_tenant << "\n"; } ::testing::InitGoogleTest(&argc, argv); @@ -1398,6 +1400,7 @@ int main(int argc, char **argv) gtest::env = new gtest::Environment(); gtest::env->logfile = c_logfile; gtest::env->loglevel = c_loglevel; + gtest::env->tenant = c_tenant; ::testing::AddGlobalTestEnvironment(gtest::env); ret = RUN_ALL_TESTS(); -- 2.39.5