From 6b7ab1237e1776435aea49cf4aac4e9c17361c7c Mon Sep 17 00:00:00 2001 From: yousukseung <85715732+yousukseung@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:43:31 +0000 Subject: [PATCH] Automated change: Fix sanity tests --- src/core/lib/surface/init.h | 4 ++-- src/core/tsi/ssl_transport_security.cc | 7 +++---- test/core/surface/init_test.cc | 7 ++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h index 9f9a4a468807f..804b79c5d5b31 100644 --- a/src/core/lib/surface/init.h +++ b/src/core/lib/surface/init.h @@ -18,10 +18,10 @@ #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H -#include - #include "absl/time/time.h" +#include + void grpc_maybe_wait_for_async_shutdown(void); // Returns false if the timeout expired before fully shut down. diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc index d658b39a2f3c2..501f309082dc1 100644 --- a/src/core/tsi/ssl_transport_security.cc +++ b/src/core/tsi/ssl_transport_security.cc @@ -18,10 +18,11 @@ #include "src/core/tsi/ssl_transport_security.h" -#include #include #include +#include + #include #include "src/core/lib/surface/init.h" @@ -195,9 +196,7 @@ static void init_openssl(void) { // OPENSSL registers an exit handler to clean up global objects, which // otherwise may happen before gRPC removes all references to OPENSSL. Below // exit handler is guaranteed to run after OPENSSL's. - std::atexit([](){ - grpc_wait_for_shutdown_with_timeout(absl::Seconds(2)); - }); + std::atexit([]() { grpc_wait_for_shutdown_with_timeout(absl::Seconds(2)); }); #else SSL_library_init(); SSL_load_error_strings(); diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc index 0410731403584..c8a09cc151d54 100644 --- a/test/core/surface/init_test.cc +++ b/test/core/surface/init_test.cc @@ -116,7 +116,6 @@ TEST(Init, Repeatedly) { EXPECT_FALSE(grpc_is_initialized()); } - TEST(Init, WaitForShutdownBeforeInit) { EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::ZeroDuration())); } @@ -134,15 +133,13 @@ TEST(Init, WaitForShutdownWithTimeout) { grpc_core::Thread t0( "init_test", [](void*) { - EXPECT_FALSE( - grpc_wait_for_shutdown_with_timeout(absl::Seconds(0.5))); + EXPECT_FALSE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(0.5))); }, nullptr); grpc_core::Thread t1( "init_test", [](void*) { - EXPECT_TRUE( - grpc_wait_for_shutdown_with_timeout(absl::Seconds(1.5))); + EXPECT_TRUE(grpc_wait_for_shutdown_with_timeout(absl::Seconds(1.5))); }, nullptr); t0.Start();