Skip to content

Commit e83b124

Browse files
authored
Merge pull request ceph#61449 from mohit84/issue_69405
neorados_pool_test: Call create_pool at the end of NeoRados delete_pool related test Reviewed-by: Matan Breizman <[email protected]>
2 parents fe3413f + 2a18459 commit e83b124

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/test/neorados/pool.cc

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,9 @@ class NeoRadosPool : public CoroTest {
8181
co_return co_await lookup_pool(pname);
8282
}
8383

84-
auto delete_pool(std::string pname) {
85-
return rados().delete_pool(pname, asio::use_awaitable);
86-
}
87-
88-
auto delete_pool(std::int64_t pid) {
89-
return rados().delete_pool(pid, asio::use_awaitable);
84+
auto delete_pool(std::string pname)-> boost::asio::awaitable<void> {
85+
co_await rados().delete_pool(pname, asio::use_awaitable);
86+
created_pools.erase(pname);
9087
}
9188

9289
public:
@@ -103,7 +100,8 @@ class NeoRadosPool : public CoroTest {
103100

104101
/// \brief Delete pool used for testing
105102
boost::asio::awaitable<void> CoTearDown() override {
106-
for (const auto& name : created_pools) try {
103+
auto pools_to_delete = created_pools;
104+
for (const auto& name : pools_to_delete) try {
107105
co_await delete_pool(name);
108106
} catch (const sys::system_error& e) {
109107
if (e.code() != osdc_errc::pool_dne) {
@@ -151,7 +149,6 @@ CORO_TEST_F(NeoRadosPools, PoolDelete, NeoRadosPool) {
151149
co_await delete_pool(pname);
152150
co_await expect_error_code(lookup_pool(pname),
153151
sys::errc::no_such_file_or_directory);
154-
co_await create_pool(pname);
155152
co_return;
156153
}
157154

0 commit comments

Comments
 (0)