From f9352acca26872abe90039f5444386e704b68a90 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 26 Apr 2024 14:23:28 +0800 Subject: [PATCH] test/crimson/gtest_seastar: add logs Signed-off-by: Yingxin Cheng --- src/test/crimson/gtest_seastar.h | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/test/crimson/gtest_seastar.h b/src/test/crimson/gtest_seastar.h index 927d9e95e2b03..bf53dfe99e525 100644 --- a/src/test/crimson/gtest_seastar.h +++ b/src/test/crimson/gtest_seastar.h @@ -4,6 +4,7 @@ #pragma once #include "crimson/common/errorator.h" +#include "crimson/common/log.h" #include "gtest/gtest.h" #include "seastar_runner.h" @@ -11,26 +12,39 @@ struct seastar_test_suite_t : public ::testing::Test { static SeastarRunner seastar_env; + template + void do_run(Func &&func, const char *name) { + seastar_env.run([func=std::forward(func), name]() mutable { + crimson::get_logger(ceph_subsys_test).info( + "{} started...", name); + return std::invoke(std::move(func) + ).finally([name] { + crimson::get_logger(ceph_subsys_test).info( + "{} finished", name); + }); + }); + } + template void run(Func &&func) { - seastar_env.run(std::forward(func)); + do_run(std::forward(func), "run"); } template void run_ertr(Func &&func) { - run( + do_run( [func=std::forward(func)]() mutable { return std::invoke(std::move(func)).handle_error( crimson::ct_error::assert_all("error")); - }); + }, "run_ertr"); } template void run_async(Func &&func) { - run( + do_run( [func=std::forward(func)]() mutable { return seastar::async(std::forward(func)); - }); + }, "run_async"); } template @@ -41,9 +55,9 @@ struct seastar_test_suite_t : public ::testing::Test { } void run_scl(auto &&f) { - run([this, f=std::forward(f)]() mutable { + do_run([this, f=std::forward(f)]() mutable { return std::invoke(scl(std::move(f))); - }); + }, "run_scl"); } void run_ertr_scl(auto &&f) { @@ -52,11 +66,11 @@ struct seastar_test_suite_t : public ::testing::Test { virtual seastar::future<> set_up_fut() { return seastar::now(); } void SetUp() final { - run([this] { return set_up_fut(); }); + do_run([this] { return set_up_fut(); }, "setup"); } virtual seastar::future<> tear_down_fut() { return seastar::now(); } void TearDown() final { - run([this] { return tear_down_fut(); }); + do_run([this] { return tear_down_fut(); }, "teardown"); } }; -- 2.39.5