From 49cd76bebb8cd883476ebe3c665bef9f64a6fc4c Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 26 Apr 2024 14:21:38 +0800 Subject: [PATCH] test/crimson/gtest_seastar: cleanups Signed-off-by: Yingxin Cheng --- src/test/crimson/gtest_seastar.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/crimson/gtest_seastar.h b/src/test/crimson/gtest_seastar.h index 34967c2531510..927d9e95e2b03 100644 --- a/src/test/crimson/gtest_seastar.h +++ b/src/test/crimson/gtest_seastar.h @@ -13,12 +13,12 @@ struct seastar_test_suite_t : public ::testing::Test { template void run(Func &&func) { - return seastar_env.run(std::forward(func)); + seastar_env.run(std::forward(func)); } template void run_ertr(Func &&func) { - return run( + run( [func=std::forward(func)]() mutable { return std::invoke(std::move(func)).handle_error( crimson::ct_error::assert_all("error")); @@ -40,23 +40,23 @@ struct seastar_test_suite_t : public ::testing::Test { }; } - auto run_scl(auto &&f) { - return run([this, f=std::forward(f)]() mutable { + void run_scl(auto &&f) { + run([this, f=std::forward(f)]() mutable { return std::invoke(scl(std::move(f))); }); } - auto run_ertr_scl(auto &&f) { - return run_ertr(scl(std::forward(f))); + void run_ertr_scl(auto &&f) { + run_ertr(scl(std::forward(f))); } virtual seastar::future<> set_up_fut() { return seastar::now(); } void SetUp() final { - return run([this] { return set_up_fut(); }); + run([this] { return set_up_fut(); }); } virtual seastar::future<> tear_down_fut() { return seastar::now(); } void TearDown() final { - return run([this] { return tear_down_fut(); }); + run([this] { return tear_down_fut(); }); } }; -- 2.39.5