From 5f631c3a13aa90fc2a36fe866dcae0b0c8539420 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 26 Apr 2024 17:15:46 -0700 Subject: [PATCH 1/3] [build] fix build breakage from #36452 (#36462) CC @tanvi-jagtap Closes #36462 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36462 from markdroth:build_fix 091e13d07c06f32e95ad0bf44c921221f9adac0e PiperOrigin-RevId: 628549571 --- BUILD | 4 ++++ CMakeLists.txt | 14 -------------- build_autogenerated.yaml | 14 -------------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/BUILD b/BUILD index 4d04c8d518e..aecd2c5ae7b 100644 --- a/BUILD +++ b/BUILD @@ -927,6 +927,7 @@ grpc_cc_library( "src/cpp/server/secure_server_credentials.h", ], external_deps = [ + "absl/log:check", "absl/strings:cord", ], language = "c++", @@ -1231,6 +1232,7 @@ grpc_cc_library( "src/cpp/server/insecure_server_credentials.cc", ], external_deps = [ + "absl/log:check", "absl/strings", "absl/synchronization", ], @@ -2417,6 +2419,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:any_invocable", + "absl/log:check", "absl/status", "absl/status:statusor", "absl/strings", @@ -2499,6 +2502,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/functional:any_invocable", + "absl/log:check", "absl/status", "absl/status:statusor", "absl/strings", diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c077beadd1..4cd830f2c48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5820,7 +5820,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(fd_conservation_posix_test ${_gRPC_ALLTARGETS_LIBRARIES} - absl::check grpc_test_util ) @@ -6134,7 +6133,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(address_sorting_test_unsecure ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc++_unsecure grpc_test_util_unsecure grpc++_test_config @@ -8339,7 +8337,6 @@ target_include_directories(buffer_list_test target_link_libraries(buffer_list_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -12873,7 +12870,6 @@ target_include_directories(endpoint_pair_test target_link_libraries(endpoint_pair_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -13024,7 +13020,6 @@ target_include_directories(error_test target_link_libraries(error_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -23769,7 +23764,6 @@ target_include_directories(resolve_address_using_ares_resolver_test target_link_libraries(resolve_address_using_ares_resolver_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util grpc++_test_config ) @@ -23876,7 +23870,6 @@ target_include_directories(resolve_address_using_native_resolver_test target_link_libraries(resolve_address_using_native_resolver_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util grpc++_test_config ) @@ -26617,7 +26610,6 @@ target_include_directories(secure_endpoint_test target_link_libraries(secure_endpoint_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -28466,7 +28458,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(socket_utils_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -29608,7 +29599,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(tcp_posix_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc_test_util ) @@ -30396,7 +30386,6 @@ target_include_directories(test_cpp_client_credentials_test target_link_libraries(test_cpp_client_credentials_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc++ grpc_test_util ) @@ -30556,7 +30545,6 @@ target_include_directories(test_cpp_server_credentials_test target_link_libraries(test_cpp_server_credentials_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc++ grpc_test_util ) @@ -30976,7 +30964,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(time_jump_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc++ grpc_test_util ) @@ -31220,7 +31207,6 @@ target_include_directories(timer_test target_link_libraries(timer_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::check grpc++ grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index e1fa1842c2b..236cafd4d32 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5142,7 +5142,6 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: - - absl/log:check - grpc_test_util platforms: - linux @@ -5313,7 +5312,6 @@ targets: - test/cpp/util/subprocess.cc deps: - gtest - - absl/log:check - grpc++_unsecure - grpc_test_util_unsecure - grpc++_test_config @@ -6278,7 +6276,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util - name: byte_buffer_test gtest: true @@ -8990,7 +8987,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util - name: env_test gtest: true @@ -9048,7 +9044,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util uses_polling: false - name: error_utils_test @@ -15316,7 +15311,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util - grpc++_test_config - name: resolve_address_using_native_resolver_posix_test @@ -15386,7 +15380,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util - grpc++_test_config - name: resource_quota_end2end_stress_test @@ -17767,7 +17760,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util - name: security_connector_test gtest: true @@ -18713,7 +18705,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util platforms: - linux @@ -19193,7 +19184,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/log:check - grpc_test_util platforms: - linux @@ -19595,7 +19585,6 @@ targets: - test/cpp/util/tls_test_utils.cc deps: - gtest - - absl/log:check - grpc++ - grpc_test_util - name: test_cpp_end2end_ssl_credentials_test @@ -19663,7 +19652,6 @@ targets: - test/cpp/util/tls_test_utils.cc deps: - gtest - - absl/log:check - grpc++ - grpc_test_util - name: test_cpp_util_slice_test @@ -19795,7 +19783,6 @@ targets: - test/cpp/common/time_jump_test.cc deps: - gtest - - absl/log:check - grpc++ - grpc_test_util platforms: @@ -19928,7 +19915,6 @@ targets: - test/cpp/common/timer_test.cc deps: - gtest - - absl/log:check - grpc++ - grpc_test_util - name: tls_certificate_verifier_test From 82718c4bfe75394892fc634f722ad302e2dc0635 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Fri, 26 Apr 2024 18:26:38 -0700 Subject: [PATCH 2/3] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36439) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT Replacing GPR_ASSERT with absl CHECK These changes have been made using string replacement and regex. Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced. Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer. Closes #36439 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36439 from tanvi-jagtap:tjagtap_iomgr_large fd759fac84f8c1d167e1c8732d532e87973614de PiperOrigin-RevId: 628564520 --- CMakeLists.txt | 1 + build_autogenerated.yaml | 1 + test/core/iomgr/BUILD | 8 +++- test/core/iomgr/tcp_posix_test.cc | 64 +++++++++++++++-------------- test/core/iomgr/timer_list_test.cc | 66 +++++++++++++++--------------- 5 files changed, 76 insertions(+), 64 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cd830f2c48..7ccf8130b62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5981,6 +5981,7 @@ target_include_directories(test_core_iomgr_timer_list_test target_link_libraries(test_core_iomgr_timer_list_test ${_gRPC_ALLTARGETS_LIBRARIES} + absl::check grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 236cafd4d32..bb586dd5e5a 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5213,6 +5213,7 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: + - absl/log:check - grpc_test_util uses_polling: false - name: activity_test diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index 57837c479ea..b557080c9dd 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -258,7 +258,10 @@ grpc_cc_test( grpc_cc_test( name = "tcp_posix_test", srcs = ["tcp_posix_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], language = "C++", tags = [ "endpoint_test", @@ -343,6 +346,9 @@ grpc_cc_test( grpc_cc_test( name = "timer_list_test", srcs = ["timer_list_test.cc"], + external_deps = [ + "absl/log:check", + ], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index fcf11f3d381..a3ff1b48557 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -36,6 +36,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -80,11 +82,11 @@ static constexpr int64_t kDeadlineMillis = 20000; static void create_sockets(int sv[2]) { int flags; - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + CHECK_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv), 0); flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + CHECK_EQ(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK), 0); flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + CHECK_EQ(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK), 0); } static ssize_t fill_socket(int fd) { @@ -101,7 +103,7 @@ static ssize_t fill_socket(int fd) { total_bytes += write_bytes; } } while (write_bytes >= 0 || errno == EINTR); - GPR_ASSERT(errno == EAGAIN); + CHECK(errno == EAGAIN); return total_bytes; } @@ -143,7 +145,7 @@ static size_t count_slices(grpc_slice* slices, size_t nslices, for (i = 0; i < nslices; ++i) { buf = GRPC_SLICE_START_PTR(slices[i]); for (j = 0; j < GRPC_SLICE_LENGTH(slices[i]); ++j) { - GPR_ASSERT(buf[j] == *current_data); + CHECK(buf[j] == *current_data); *current_data = (*current_data + 1) % 256; } num_bytes += GRPC_SLICE_LENGTH(slices[i]); @@ -157,14 +159,14 @@ static void read_cb(void* user_data, grpc_error_handle error) { size_t read_bytes; int current_data; - GPR_ASSERT(error.ok()); + CHECK_OK(error); gpr_mu_lock(g_mu); current_data = state->read_bytes % 256; // The number of bytes read each time this callback is invoked must be >= // the min_progress_size. if (grpc_core::IsTcpFrameSizeTuningEnabled()) { - GPR_ASSERT(state->min_progress_size <= state->incoming.length); + CHECK(state->min_progress_size <= state->incoming.length); } read_bytes = count_slices(state->incoming.slices, state->incoming.count, ¤t_data); @@ -172,8 +174,7 @@ static void read_cb(void* user_data, grpc_error_handle error) { gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, state->target_read_bytes); if (state->read_bytes >= state->target_read_bytes) { - GPR_ASSERT( - GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); + CHECK(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } else { gpr_mu_unlock(g_mu); @@ -233,13 +234,13 @@ static void read_test(size_t num_bytes, size_t slice_size, gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + CHECK(GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + CHECK(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy(&state.incoming); @@ -297,13 +298,13 @@ static void large_read_test(size_t slice_size, int min_progress_size) { gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + CHECK(GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + CHECK(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy(&state.incoming); @@ -337,18 +338,18 @@ static grpc_slice* allocate_blocks(size_t num_bytes, size_t slice_size, (*current_data)++; } } - GPR_ASSERT(num_bytes_left == 0); + CHECK_EQ(num_bytes_left, 0); return slices; } static void write_done(void* user_data /* write_socket_state */, grpc_error_handle error) { - GPR_ASSERT(error.ok()); + CHECK_OK(error); struct write_socket_state* state = static_cast(user_data); gpr_mu_lock(g_mu); state->write_done = 1; - GPR_ASSERT( + CHECK( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -363,12 +364,12 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { grpc_core::ExecCtx exec_ctx; flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); + CHECK_EQ(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK), 0); for (;;) { grpc_pollset_worker* worker = nullptr; gpr_mu_lock(g_mu); - GPR_ASSERT(GRPC_LOG_IF_ERROR( + CHECK(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::FromTimespecRoundUp( @@ -379,16 +380,16 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); } while (bytes_read < 0 && errno == EINTR); - GPR_ASSERT(bytes_read >= 0); + CHECK_GE(bytes_read, 0); for (i = 0; i < bytes_read; ++i) { - GPR_ASSERT(buf[i] == current); + CHECK(buf[i] == current); current = (current + 1) % 256; } bytes_left -= static_cast(bytes_read); if (bytes_left == 0) break; } flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); + CHECK_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0); gpr_free(buf); } @@ -453,8 +454,8 @@ static void write_test(size_t num_bytes, size_t slice_size) { if (state.write_done) { break; } - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + CHECK(GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); exec_ctx.Flush(); gpr_mu_lock(g_mu); @@ -531,7 +532,8 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_event_engine::experimental::ChannelArgsEndpointConfig( grpc_core::ChannelArgs::FromC(&args))), "test"); - GPR_ASSERT(grpc_tcp_fd(ep) == sv[1] && sv[1] >= 0); + CHECK(grpc_tcp_fd(ep) == sv[1]); + CHECK_GE(sv[1], 0); } grpc_endpoint_add_to_pollset(ep, g_pollset); @@ -551,23 +553,23 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( - "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); + CHECK(GRPC_LOG_IF_ERROR("pollset_work", + grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + CHECK(state.read_bytes == state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy(&state.incoming); grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb); grpc_core::ExecCtx::Get()->Flush(); rel_fd.notify.WaitForNotificationWithTimeout(absl::Seconds(20)); - GPR_ASSERT(rel_fd.fd_released_done == 1); - GPR_ASSERT(fd == sv[1]); + CHECK_EQ(rel_fd.fd_released_done, 1); + CHECK(fd == sv[1]); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); written_bytes = fill_socket_partial(fd, num_bytes); diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 012392a5c95..74d87085b90 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -21,6 +21,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -78,38 +80,38 @@ static void add_test(void) { // collect timers. Only the first batch should be ready. grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(500)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 20; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); + CHECK(cb_called[i][1] == (i < 10)); + CHECK_EQ(cb_called[i][0], 0); } grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(600)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); + CHECK(cb_called[i][1] == (i < 10)); + CHECK_EQ(cb_called[i][0], 0); } // collect the rest of the timers grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(1500)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); + CHECK(cb_called[i][1] == (i < 20)); + CHECK_EQ(cb_called[i][0], 0); } grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(1600)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); + CHECK(cb_called[i][1] == (i < 20)); + CHECK_EQ(cb_called[i][0], 0); } grpc_timer_list_shutdown(); @@ -146,19 +148,19 @@ void destruction_test(void) { GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); grpc_core::ExecCtx::Get()->TestOnlySetNow( grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch(2)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[4][1]); + CHECK_EQ(cb_called[4][1], 1); grpc_timer_cancel(&timers[0]); grpc_timer_cancel(&timers[3]); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[0][0]); - GPR_ASSERT(1 == cb_called[3][0]); + CHECK_EQ(cb_called[0][0], 1); + CHECK_EQ(cb_called[3][0], 1); grpc_timer_list_shutdown(); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[2][0]); + CHECK_EQ(cb_called[1][0], 1); + CHECK_EQ(cb_called[2][0], 1); } // Cleans up a list with pending timers that simulate long-running-services. @@ -180,7 +182,7 @@ void long_running_service_cleanup_test(void) { gpr_log(GPR_INFO, "long_running_service_cleanup_test"); grpc_core::Timestamp now = grpc_core::Timestamp::Now(); - GPR_ASSERT(now.milliseconds_after_process_epoch() >= k25Days.millis()); + CHECK(now.milliseconds_after_process_epoch() >= k25Days.millis()); grpc_timer_list_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); @@ -209,24 +211,24 @@ void long_running_service_cleanup_test(void) { grpc_core::ExecCtx::Get()->TestOnlySetNow( now + grpc_core::Duration::Milliseconds(4)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + CHECK(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(0 == cb_called[0][0]); // Timer 0 not called - GPR_ASSERT(0 == cb_called[0][1]); - GPR_ASSERT(0 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[1][1]); // Timer 1 fired - GPR_ASSERT(0 == cb_called[2][0]); // Timer 2 not called - GPR_ASSERT(0 == cb_called[2][1]); - GPR_ASSERT(0 == cb_called[3][0]); // Timer 3 not called - GPR_ASSERT(0 == cb_called[3][1]); + CHECK_EQ(cb_called[0][0], 0); // Timer 0 not called + CHECK_EQ(cb_called[0][1], 0); + CHECK_EQ(cb_called[1][0], 0); + CHECK_EQ(cb_called[1][1], 1); // Timer 1 fired + CHECK_EQ(cb_called[2][0], 0); // Timer 2 not called + CHECK_EQ(cb_called[2][1], 0); + CHECK_EQ(cb_called[3][0], 0); // Timer 3 not called + CHECK_EQ(cb_called[3][1], 0); grpc_timer_list_shutdown(); grpc_core::ExecCtx::Get()->Flush(); // Timers 0, 2, and 3 were fired with an error during cleanup - GPR_ASSERT(1 == cb_called[0][0]); - GPR_ASSERT(0 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[2][0]); - GPR_ASSERT(1 == cb_called[3][0]); + CHECK_EQ(cb_called[0][0], 1); + CHECK_EQ(cb_called[1][0], 0); + CHECK_EQ(cb_called[2][0], 1); + CHECK_EQ(cb_called[3][0], 1); } int main(int argc, char** argv) { From 60dc14e833de6701eb0ed0e02ac30505a9ed17c2 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Sun, 28 Apr 2024 21:33:07 -0700 Subject: [PATCH 3/3] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36457) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT Replacing GPR_ASSERT with absl CHECK. These changes have been made using string replacement and regex. Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced. Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer. Closes #36457 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36457 from tanvi-jagtap:tjagtap_misc_test 978d0411b8b9cde2f2d1349a6f10251dd1239080 PiperOrigin-RevId: 628949744 --- CMakeLists.txt | 2 +- build_autogenerated.yaml | 2 +- test/core/bad_ssl/bad_ssl_test.cc | 6 ++- test/core/bad_ssl/generate_tests.bzl | 6 +++ test/core/bad_ssl/server_common.cc | 22 ++++++----- test/core/bad_ssl/servers/alpn.cc | 6 ++- test/core/bad_ssl/servers/cert.cc | 4 +- test/core/channel/BUILD | 6 ++- test/core/channel/channel_args_test.cc | 31 +++++++-------- .../channel/minimal_stack_is_minimal_test.cc | 3 +- .../BUILD | 1 + .../resolver_fuzzer.cc | 3 +- test/core/gpr/BUILD | 1 + test/core/gpr/log_test.cc | 14 ++++--- test/core/gprpp/BUILD | 3 ++ test/core/gprpp/chunked_vector_fuzzer.cc | 8 ++-- test/core/gprpp/dual_ref_counted_test.cc | 5 ++- test/core/gprpp/ref_counted_ptr_test.cc | 7 ++-- test/core/handshake/BUILD | 4 ++ test/core/handshake/server_ssl_common.cc | 15 +++---- test/core/handshake/verify_peer_options.cc | 39 ++++++++++--------- test/core/http/BUILD | 11 +++++- test/core/http/httpcli_test.cc | 34 ++++++++-------- test/core/http/httpcli_test_util.cc | 5 ++- test/core/http/httpscli_test.cc | 21 +++++----- test/core/json/BUILD | 1 + test/core/json/fuzzer.cc | 5 ++- test/core/load_balancing/BUILD | 2 + test/core/load_balancing/lb_policy_test_lib.h | 19 ++++----- .../static_stride_scheduler_benchmark.cc | 7 ++-- test/core/network_benchmarks/BUILD | 1 + .../network_benchmarks/low_level_ping_pong.cc | 14 ++++--- test/core/promise/BUILD | 1 + test/core/promise/promise_fuzzer.cc | 12 +++--- test/core/resolver/BUILD | 5 ++- test/core/resolver/endpoint_addresses_test.cc | 5 ++- test/core/resource_quota/BUILD | 1 + test/core/resource_quota/call_checker.h | 6 ++- test/core/slice/BUILD | 6 ++- test/core/slice/percent_encode_fuzzer.cc | 4 +- test/core/slice/slice_buffer_test.cc | 3 +- 41 files changed, 210 insertions(+), 141 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ccf8130b62..500e843d929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5933,6 +5933,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) target_link_libraries(static_stride_scheduler_benchmark ${_gRPC_ALLTARGETS_LIBRARIES} absl::algorithm_container + absl::check absl::span ${_gRPC_BENCHMARK_LIBRARIES} gpr @@ -5981,7 +5982,6 @@ target_include_directories(test_core_iomgr_timer_list_test target_link_libraries(test_core_iomgr_timer_list_test ${_gRPC_ALLTARGETS_LIBRARIES} - absl::check grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index bb586dd5e5a..a37a1b46dee 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5177,6 +5177,7 @@ targets: - test/core/load_balancing/static_stride_scheduler_benchmark.cc deps: - absl/algorithm:container + - absl/log:check - absl/types:span - benchmark - gpr @@ -5213,7 +5214,6 @@ targets: - test/core/util/slice_splitter.cc - test/core/util/tracer_util.cc deps: - - absl/log:check - grpc_test_util uses_polling: false - name: activity_test diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index 40b1d87c66b..d877809e390 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -21,6 +21,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -101,12 +103,12 @@ static void run_test(const char* target, size_t nops) { op++; error = grpc_call_start_batch(c, ops, nops, grpc_core::CqVerifier::tag(1), nullptr); - GPR_ASSERT(GRPC_CALL_OK == error); + CHECK_EQ(error, GRPC_CALL_OK); cqv.Expect(grpc_core::CqVerifier::tag(1), true); cqv.Verify(); - GPR_ASSERT(status != GRPC_STATUS_OK); + CHECK(status != GRPC_STATUS_OK); grpc_call_unref(c); grpc_slice_unref(details); diff --git a/test/core/bad_ssl/generate_tests.bzl b/test/core/bad_ssl/generate_tests.bzl index ecce282765a..bda7afc05bf 100755 --- a/test/core/bad_ssl/generate_tests.bzl +++ b/test/core/bad_ssl/generate_tests.bzl @@ -33,6 +33,9 @@ def grpc_bad_ssl_tests(): name = "bad_ssl_test_server", srcs = ["server_common.cc"], hdrs = ["server_common.h"], + external_deps = [ + "absl/log:check", + ], deps = [ "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", @@ -48,6 +51,9 @@ def grpc_bad_ssl_tests(): grpc_cc_test( name = "bad_ssl_%s_test" % t, srcs = ["bad_ssl_test.cc"], + external_deps = [ + "absl/log:check", + ], data = [ ":bad_ssl_%s_server" % t, "//src/core/tsi/test_creds:badserver.key", diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc index 1c61031a860..6d365968fc0 100644 --- a/test/core/bad_ssl/server_common.cc +++ b/test/core/bad_ssl/server_common.cc @@ -20,6 +20,8 @@ #include +#include "absl/log/check.h" + #include #include @@ -42,7 +44,7 @@ const char* bad_ssl_addr(int argc, char** argv) { gpr_cmdline_add_string(cl, "bind", "Bind host:port", &addr); gpr_cmdline_parse(cl, argc, argv); gpr_cmdline_destroy(cl); - GPR_ASSERT(addr); + CHECK(addr); return addr; } @@ -67,7 +69,7 @@ void bad_ssl_run(grpc_server* server) { error = grpc_server_request_call(server, &s, &call_details, &request_metadata_recv, cq, cq, reinterpret_cast(1)); - GPR_ASSERT(GRPC_CALL_OK == error); + CHECK_EQ(error, GRPC_CALL_OK); signal(SIGINT, sigint_handler); while (!shutdown_finished) { @@ -75,10 +77,10 @@ void bad_ssl_run(grpc_server* server) { gpr_log(GPR_INFO, "Shutting down due to SIGINT"); shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr); grpc_server_shutdown_and_notify(server, shutdown_cq, nullptr); - GPR_ASSERT(grpc_completion_queue_pluck( - shutdown_cq, nullptr, grpc_timeout_seconds_to_deadline(5), - nullptr) - .type == GRPC_OP_COMPLETE); + CHECK(grpc_completion_queue_pluck(shutdown_cq, nullptr, + grpc_timeout_seconds_to_deadline(5), + nullptr) + .type == GRPC_OP_COMPLETE); grpc_completion_queue_destroy(shutdown_cq); grpc_completion_queue_shutdown(cq); shutdown_started = 1; @@ -90,11 +92,11 @@ void bad_ssl_run(grpc_server* server) { nullptr); switch (ev.type) { case GRPC_OP_COMPLETE: - GPR_ASSERT(ev.tag == (void*)1); - GPR_ASSERT(ev.success == 0); + CHECK(ev.tag == (void*)1); + CHECK_EQ(ev.success, 0); break; case GRPC_QUEUE_SHUTDOWN: - GPR_ASSERT(shutdown_started); + CHECK(shutdown_started); shutdown_finished = 1; break; case GRPC_QUEUE_TIMEOUT: @@ -102,7 +104,7 @@ void bad_ssl_run(grpc_server* server) { } } - GPR_ASSERT(s == nullptr); + CHECK_EQ(s, nullptr); grpc_call_details_destroy(&call_details); grpc_metadata_array_destroy(&request_metadata_recv); } diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc index 049e87f9700..c1752f9b326 100644 --- a/test/core/bad_ssl/servers/alpn.cc +++ b/test/core/bad_ssl/servers/alpn.cc @@ -20,6 +20,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -54,7 +56,7 @@ size_t grpc_chttp2_num_alpn_versions(void) { } const char* grpc_chttp2_get_alpn_version_index(size_t i) { - GPR_ASSERT(i < GPR_ARRAY_SIZE(fake_versions)); + CHECK(i < GPR_ARRAY_SIZE(fake_versions)); return fake_versions[i]; } @@ -72,7 +74,7 @@ int main(int argc, char** argv) { ssl_creds = grpc_ssl_server_credentials_create(nullptr, &pem_key_cert_pair, 1, 0, nullptr); server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_http2_port(server, addr, ssl_creds)); + CHECK(grpc_server_add_http2_port(server, addr, ssl_creds)); grpc_server_credentials_release(ssl_creds); bad_ssl_run(server); diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc index 4c6b26a025c..e8ed29b1089 100644 --- a/test/core/bad_ssl/servers/cert.cc +++ b/test/core/bad_ssl/servers/cert.cc @@ -16,6 +16,8 @@ // // +#include "absl/log/check.h" + #include #include #include @@ -47,7 +49,7 @@ int main(int argc, char** argv) { ssl_creds = grpc_ssl_server_credentials_create(nullptr, &pem_key_cert_pair, 1, 0, nullptr); server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_http2_port(server, addr, ssl_creds)); + CHECK(grpc_server_add_http2_port(server, addr, ssl_creds)); grpc_server_credentials_release(ssl_creds); bad_ssl_run(server); diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index 718b0300a0e..fa5649b9c96 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -35,7 +35,10 @@ grpc_cc_test( grpc_cc_test( name = "channel_args_test", srcs = ["channel_args_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, @@ -82,6 +85,7 @@ grpc_cc_test( name = "minimal_stack_is_minimal_test", srcs = ["minimal_stack_is_minimal_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], language = "C++", diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 9e722c67f84..d7a3b9f6986 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -20,6 +20,7 @@ #include +#include "absl/log/check.h" #include "gtest/gtest.h" #include @@ -254,15 +255,14 @@ TEST(GrpcChannelArgsTest, Create) { const_cast("str value")); ch_args = grpc_channel_args_copy_and_add(nullptr, to_add, 2); - GPR_ASSERT(ch_args->num_args == 2); - GPR_ASSERT(strcmp(ch_args->args[0].key, to_add[0].key) == 0); - GPR_ASSERT(ch_args->args[0].type == to_add[0].type); - GPR_ASSERT(ch_args->args[0].value.integer == to_add[0].value.integer); + CHECK_EQ(ch_args->num_args, 2); + CHECK_EQ(strcmp(ch_args->args[0].key, to_add[0].key), 0); + CHECK(ch_args->args[0].type == to_add[0].type); + CHECK(ch_args->args[0].value.integer == to_add[0].value.integer); - GPR_ASSERT(strcmp(ch_args->args[1].key, to_add[1].key) == 0); - GPR_ASSERT(ch_args->args[1].type == to_add[1].type); - GPR_ASSERT(strcmp(ch_args->args[1].value.string, to_add[1].value.string) == - 0); + CHECK_EQ(strcmp(ch_args->args[1].key, to_add[1].key), 0); + CHECK(ch_args->args[1].type == to_add[1].type); + CHECK(strcmp(ch_args->args[1].value.string, to_add[1].value.string) == 0); grpc_channel_args_destroy(ch_args); } @@ -318,19 +318,18 @@ TEST(GrpcChannelArgsTest, ChannelCreateWithArgs) { grpc_channel_args* mutate_channel_args(const char* target, grpc_channel_args* old_args, grpc_channel_stack_type /*type*/) { - GPR_ASSERT(old_args != nullptr); - GPR_ASSERT(grpc_channel_args_find(old_args, "arg_int")->value.integer == 0); - GPR_ASSERT(strcmp(grpc_channel_args_find(old_args, "arg_str")->value.string, - "arg_str_val") == 0); - GPR_ASSERT( - grpc_channel_args_find(old_args, "arg_pointer")->value.pointer.vtable == - &fake_pointer_arg_vtable); + CHECK_NE(old_args, nullptr); + CHECK_EQ(grpc_channel_args_find(old_args, "arg_int")->value.integer, 0); + CHECK(strcmp(grpc_channel_args_find(old_args, "arg_str")->value.string, + "arg_str_val") == 0); + CHECK(grpc_channel_args_find(old_args, "arg_pointer")->value.pointer.vtable == + &fake_pointer_arg_vtable); if (strcmp(target, "no_op_mutator") == 0) { return old_args; } - GPR_ASSERT(strcmp(target, "minimal_stack_mutator") == 0); + CHECK_EQ(strcmp(target, "minimal_stack_mutator"), 0); const char* args_to_remove[] = {"arg_int", "arg_str", "arg_pointer"}; grpc_arg no_deadline_filter_arg = grpc_channel_arg_integer_create( diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index 9212816e745..e94a66a5e2c 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -34,6 +34,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" @@ -95,7 +96,7 @@ std::vector MakeStack(const char* transport_name, builder.SetTarget("foo.test.google.fr"); { grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(grpc_core::CoreConfiguration::Get().channel_init().CreateStack( + CHECK(grpc_core::CoreConfiguration::Get().channel_init().CreateStack( &builder)); } diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/BUILD b/test/core/ext/filters/event_engine_client_channel_resolver/BUILD index cc2c12fbd50..b9ab05b4451 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/BUILD +++ b/test/core/ext/filters/event_engine_client_channel_resolver/BUILD @@ -24,6 +24,7 @@ grpc_proto_fuzzer( size = "enormous", srcs = ["resolver_fuzzer.cc"], corpus = "resolver_fuzzer_corpus", + external_deps = ["absl/log:check"], language = "C++", proto = "resolver_fuzzer.proto", proto_deps = [ diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc index 7766e5b4591..0c7dcd1003d 100644 --- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc +++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc @@ -20,6 +20,7 @@ #include "absl/base/thread_annotations.h" #include "absl/functional/any_invocable.h" +#include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -240,7 +241,7 @@ grpc_core::ResolverArgs ConstructResolverArgs( std::shared_ptr work_serializer) { grpc_core::ResolverArgs resolver_args; auto uri = grpc_core::URI::Parse("dns:localhost"); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); resolver_args.uri = *uri; resolver_args.args = channel_args; resolver_args.pollset_set = nullptr; diff --git a/test/core/gpr/BUILD b/test/core/gpr/BUILD index 119b888947f..9b4eb894ddf 100644 --- a/test/core/gpr/BUILD +++ b/test/core/gpr/BUILD @@ -61,6 +61,7 @@ grpc_cc_test( name = "log_test", srcs = ["log_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], language = "C++", diff --git a/test/core/gpr/log_test.cc b/test/core/gpr/log_test.cc index 2e1ea0c5ca7..e4f02c175a7 100644 --- a/test/core/gpr/log_test.cc +++ b/test/core/gpr/log_test.cc @@ -22,6 +22,8 @@ #include +#include "absl/log/check.h" + #include #include "src/core/lib/gprpp/crash.h" @@ -30,9 +32,9 @@ static bool log_func_reached = false; static void test_callback(gpr_log_func_args* args) { - GPR_ASSERT(0 == strcmp(__FILE__, args->file)); - GPR_ASSERT(args->severity == GPR_LOG_SEVERITY_INFO); - GPR_ASSERT(0 == strcmp(args->message, "hello 1 2 3")); + CHECK_EQ(strcmp(__FILE__, args->file), 0); + CHECK(args->severity == GPR_LOG_SEVERITY_INFO); + CHECK_EQ(strcmp(args->message, "hello 1 2 3"), 0); } static void test_should_log(gpr_log_func_args* /*args*/) { @@ -47,10 +49,10 @@ static void test_should_not_log(gpr_log_func_args* /*args*/) { gpr_set_log_function(test_should_log); \ log_func_reached = false; \ gpr_log_message(SEVERITY, "hello 1 2 3"); \ - GPR_ASSERT(log_func_reached); \ + CHECK(log_func_reached); \ log_func_reached = false; \ gpr_log(SEVERITY, "hello %d %d %d", 1, 2, 3); \ - GPR_ASSERT(log_func_reached); \ + CHECK(log_func_reached); \ gpr_set_log_function(nullptr); #define test_log_function_unreached(SEVERITY) \ @@ -65,7 +67,7 @@ TEST(LogTest, Basic) { gpr_log(GPR_INFO, "%s", "hello world"); gpr_log(GPR_ERROR, "%s", "hello world"); // should succeed - GPR_ASSERT(1); + CHECK(1); gpr_set_log_function(test_callback); gpr_log_message(GPR_INFO, "hello 1 2 3"); gpr_log(GPR_INFO, "hello %d %d %d", 1, 2, 3); diff --git a/test/core/gprpp/BUILD b/test/core/gprpp/BUILD index 6ec04014d73..7b20e55ad30 100644 --- a/test/core/gprpp/BUILD +++ b/test/core/gprpp/BUILD @@ -220,6 +220,7 @@ grpc_cc_test( name = "dual_ref_counted_test", srcs = ["dual_ref_counted_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], language = "C++", @@ -234,6 +235,7 @@ grpc_cc_test( srcs = ["ref_counted_ptr_test.cc"], external_deps = [ "absl/container:flat_hash_set", + "absl/log:check", "gtest", ], language = "C++", @@ -337,6 +339,7 @@ grpc_proto_fuzzer( name = "chunked_vector_fuzzer", srcs = ["chunked_vector_fuzzer.cc"], corpus = "chunked_vector_corpora", + external_deps = ["absl/log:check"], language = "C++", proto = "chunked_vector_fuzzer.proto", tags = ["no_windows"], diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/gprpp/chunked_vector_fuzzer.cc index c29fb8eeb4b..8463fdd797f 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/gprpp/chunked_vector_fuzzer.cc @@ -20,6 +20,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -46,15 +48,15 @@ struct Comparison { // Check that both chunked and std are equivalent. void AssertOk() const { - GPR_ASSERT(std.size() == chunked.size()); + CHECK(std.size() == chunked.size()); auto it_chunked = chunked.cbegin(); auto it_std = std.cbegin(); while (it_std != std.cend()) { - GPR_ASSERT(**it_std == **it_chunked); + CHECK(**it_std == **it_chunked); ++it_chunked; ++it_std; } - GPR_ASSERT(it_chunked == chunked.cend()); + CHECK(it_chunked == chunked.cend()); } }; diff --git a/test/core/gprpp/dual_ref_counted_test.cc b/test/core/gprpp/dual_ref_counted_test.cc index 56690734c28..9f9165007e1 100644 --- a/test/core/gprpp/dual_ref_counted_test.cc +++ b/test/core/gprpp/dual_ref_counted_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "gtest/gtest.h" #include "test/core/util/test_config.h" @@ -29,7 +30,7 @@ namespace { class Foo : public DualRefCounted { public: Foo() = default; - ~Foo() override { GPR_ASSERT(shutting_down_); } + ~Foo() override { CHECK(shutting_down_); } void Orphaned() override { shutting_down_ = true; } @@ -92,7 +93,7 @@ TEST(DualRefCounted, RefAndWeakRefAsSubclass) { class FooWithTracing : public DualRefCounted { public: FooWithTracing() : DualRefCounted("FooWithTracing") {} - ~FooWithTracing() override { GPR_ASSERT(shutting_down_); } + ~FooWithTracing() override { CHECK(shutting_down_); } void Orphaned() override { shutting_down_ = true; } diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc index d91cf3a238f..a75c2a51610 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/gprpp/ref_counted_ptr_test.cc @@ -21,6 +21,7 @@ #include #include "absl/container/flat_hash_set.h" +#include "absl/log/check.h" #include "gtest/gtest.h" #include @@ -274,7 +275,7 @@ class Bar : public DualRefCounted { explicit Bar(int value) : value_(value) {} - ~Bar() override { GPR_ASSERT(shutting_down_); } + ~Bar() override { CHECK(shutting_down_); } void Orphaned() override { shutting_down_ = true; } @@ -430,7 +431,7 @@ class BarWithTracing : public DualRefCounted { public: BarWithTracing() : DualRefCounted("BarWithTracing") {} - ~BarWithTracing() override { GPR_ASSERT(shutting_down_); } + ~BarWithTracing() override { CHECK(shutting_down_); } void Orphaned() override { shutting_down_ = true; } @@ -453,7 +454,7 @@ class WeakBaseClass : public DualRefCounted { public: WeakBaseClass() {} - ~WeakBaseClass() override { GPR_ASSERT(shutting_down_); } + ~WeakBaseClass() override { CHECK(shutting_down_); } void Orphaned() override { shutting_down_ = true; } diff --git a/test/core/handshake/BUILD b/test/core/handshake/BUILD index ded4fbd4a48..806492815f8 100644 --- a/test/core/handshake/BUILD +++ b/test/core/handshake/BUILD @@ -40,6 +40,7 @@ grpc_cc_library( name = "server_ssl_common", srcs = ["server_ssl_common.cc"], hdrs = ["server_ssl_common.h"], + external_deps = ["absl/log:check"], tags = ["no_windows"], deps = [ "//:gpr", @@ -97,6 +98,9 @@ grpc_cc_test( # "//src/core/tsi/test_creds:server1.key", # "//src/core/tsi/test_creds:server1.pem", # ], +# external_deps = [ +# "absl/log:check", +# ], # language = "C++", # tags = ["no_mac", no_windows"], # deps = [ diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index b4a0ad1e828..720c3ef5afd 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -34,6 +34,7 @@ #include #include "absl/base/thread_annotations.h" +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include @@ -131,7 +132,7 @@ void server_thread(void* arg) { // Start server listening on local port. std::string addr = absl::StrCat("127.0.0.1:", port); grpc_server* server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds)); + CHECK(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds)); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); @@ -148,7 +149,7 @@ void server_thread(void* arg) { while (!gpr_event_get(&client_handshake_complete) && retries-- > 0) { const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(1); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); + CHECK(ev.type == GRPC_QUEUE_TIMEOUT); } gpr_log(GPR_INFO, "Shutting down server"); @@ -157,7 +158,7 @@ void server_thread(void* arg) { const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(5); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + CHECK(ev.type == GRPC_OP_COMPLETE); grpc_server_destroy(server); grpc_completion_queue_destroy(cq); @@ -181,7 +182,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, // Launch the gRPC server thread. bool ok; grpc_core::Thread thd("grpc_ssl_test", server_thread, &s, &ok); - GPR_ASSERT(ok); + CHECK(ok); thd.Start(); // The work in server_thread will cause the SSL initialization to take place @@ -232,7 +233,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, memcpy(p, alpn_list[i], len); p += len; } - GPR_ASSERT(SSL_CTX_set_alpn_protos(ctx, alpn_protos, alpn_protos_len) == 0); + CHECK_EQ(SSL_CTX_set_alpn_protos(ctx, alpn_protos, alpn_protos_len), 0); // Try and connect to server. We allow a bounded number of retries as we might // be racing with the server setup on its separate thread. @@ -244,12 +245,12 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, sleep(1); } } - GPR_ASSERT(sock > 0); + CHECK_GT(sock, 0); gpr_log(GPR_INFO, "Connected to server on port %d", s.port()); // Establish a SSL* and connect at SSL layer. SSL* ssl = SSL_new(ctx); - GPR_ASSERT(ssl); + CHECK(ssl); SSL_set_fd(ssl, sock); if (SSL_connect(ssl) <= 0) { ERR_print_errors_fp(stderr); diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc index fae7ffbb5fe..7b709dc58ce 100644 --- a/test/core/handshake/verify_peer_options.cc +++ b/test/core/handshake/verify_peer_options.cc @@ -32,6 +32,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include @@ -70,7 +71,7 @@ static void server_thread(void* arg) { // Start server listening on local port. std::string addr = absl::StrCat("127.0.0.1:", port); grpc_server* server = grpc_server_create(nullptr, nullptr); - GPR_ASSERT(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds)); + CHECK(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds)); grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr); @@ -85,7 +86,7 @@ static void server_thread(void* arg) { while (!gpr_event_get(&client_handshake_complete) && retries-- > 0) { const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(1); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_TIMEOUT); + CHECK(ev.type == GRPC_QUEUE_TIMEOUT); } gpr_log(GPR_INFO, "Shutting down server"); @@ -95,7 +96,7 @@ static void server_thread(void* arg) { const gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(60); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + CHECK(ev.type == GRPC_OP_COMPLETE); grpc_server_destroy(server); grpc_completion_queue_destroy(cq); @@ -131,7 +132,7 @@ static bool verify_peer_options_test(verify_peer_options* verify_options) { // Launch the gRPC server thread. bool ok; grpc_core::Thread thd("grpc_client_ssl_test", server_thread, &port, &ok); - GPR_ASSERT(ok); + CHECK(ok); thd.Start(); // Establish a channel pointing at the TLS server. Since the gRPC runtime is @@ -146,12 +147,12 @@ static bool verify_peer_options_test(verify_peer_options* verify_options) { grpc_args.args = &ssl_name_override; grpc_channel* channel = grpc_channel_create(target.c_str(), ssl_creds, &grpc_args); - GPR_ASSERT(channel); + CHECK(channel); // Initially the channel will be idle, the // grpc_channel_check_connectivity_state triggers an attempt to connect. - GPR_ASSERT(grpc_channel_check_connectivity_state( - channel, 1 /* try_to_connect */) == GRPC_CHANNEL_IDLE); + CHECK(grpc_channel_check_connectivity_state( + channel, 1 /* try_to_connect */) == GRPC_CHANNEL_IDLE); // Wait a bounded number of times for the channel to be ready. When the // channel is ready, the initial TLS handshake will have successfully @@ -166,7 +167,7 @@ static bool verify_peer_options_test(verify_peer_options* verify_options) { channel, state, grpc_timeout_seconds_to_deadline(3), cq, nullptr); gpr_timespec cq_deadline = grpc_timeout_seconds_to_deadline(5); grpc_event ev = grpc_completion_queue_next(cq, cq_deadline, nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + CHECK(ev.type == GRPC_OP_COMPLETE); state = grpc_channel_check_connectivity_state(channel, 0 /* try_to_connect */); } @@ -229,25 +230,25 @@ int main(int argc, char* argv[]) { verify_options.verify_peer_callback = nullptr; verify_options.verify_peer_callback_userdata = nullptr; verify_options.verify_peer_destruct = nullptr; - GPR_ASSERT(verify_peer_options_test(&verify_options)); - GPR_ASSERT(strlen(callback_target_host) == 0); - GPR_ASSERT(strlen(callback_target_pem) == 0); - GPR_ASSERT(callback_userdata == nullptr); - GPR_ASSERT(destruct_userdata == nullptr); + CHECK(verify_peer_options_test(&verify_options)); + CHECK_EQ(strlen(callback_target_host), 0); + CHECK_EQ(strlen(callback_target_pem), 0); + CHECK_EQ(callback_userdata, nullptr); + CHECK_EQ(destruct_userdata, nullptr); // Running with the callbacks and verify we get the expected values verify_options.verify_peer_callback = verify_callback; verify_options.verify_peer_callback_userdata = static_cast(&userdata); verify_options.verify_peer_destruct = verify_destruct; - GPR_ASSERT(verify_peer_options_test(&verify_options)); - GPR_ASSERT(strcmp(callback_target_host, "foo.test.google.fr") == 0); - GPR_ASSERT(strcmp(callback_target_pem, server_cert.c_str()) == 0); - GPR_ASSERT(callback_userdata == static_cast(&userdata)); - GPR_ASSERT(destruct_userdata == static_cast(&userdata)); + CHECK(verify_peer_options_test(&verify_options)); + CHECK_EQ(strcmp(callback_target_host, "foo.test.google.fr"), 0); + CHECK_EQ(strcmp(callback_target_pem, server_cert.c_str()), 0); + CHECK(callback_userdata == static_cast(&userdata)); + CHECK(destruct_userdata == static_cast(&userdata)); // If the callback returns non-zero, initializing the channel should fail. callback_return_value = 1; - GPR_ASSERT(!verify_peer_options_test(&verify_options)); + CHECK(!verify_peer_options_test(&verify_options)); grpc_shutdown(); return 0; diff --git a/test/core/http/BUILD b/test/core/http/BUILD index 2495cfb1cbd..a889392b67f 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -66,6 +66,7 @@ grpc_cc_library( testonly = True, srcs = ["httpcli_test_util.cc"], hdrs = ["httpcli_test_util.h"], + external_deps = ["absl/log:check"], deps = [ "//:gpr", "//:subprocess", @@ -84,7 +85,10 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], language = "C++", tags = ["no_windows"], deps = [ @@ -110,7 +114,10 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], language = "C++", tags = ["no_windows"], deps = [ diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 7a8f3bf92b3..749e3b1b5e6 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -29,6 +29,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" @@ -94,7 +95,7 @@ class HttpRequestTest : public ::testing::Test { void RunAndKick(const std::function& f) { grpc_core::MutexLockForGprMu lock(mu_); f(); - GPR_ASSERT(GRPC_LOG_IF_ERROR( + CHECK(GRPC_LOG_IF_ERROR( "pollset_kick", grpc_pollset_kick(grpc_polling_entity_pollset(&pops_), nullptr))); } @@ -102,9 +103,9 @@ class HttpRequestTest : public ::testing::Test { void PollUntil(const std::function& predicate, absl::Time deadline) { gpr_mu_lock(mu_); while (!predicate()) { - GPR_ASSERT(absl::Now() < deadline); + CHECK(absl::Now() < deadline); grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + CHECK(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pops_), &worker, NSecondsTime(1)))); gpr_mu_unlock(mu_); @@ -164,10 +165,10 @@ void OnFinish(void* arg, grpc_error_handle error) { grpc_http_response response = request_state->response; gpr_log(GPR_INFO, "response status=%d error=%s", response.status, grpc_core::StatusToString(error).c_str()); - GPR_ASSERT(error.ok()); - GPR_ASSERT(response.status == 200); - GPR_ASSERT(response.body_length == strlen(expect)); - GPR_ASSERT(0 == memcmp(expect, response.body, response.body_length)); + CHECK(error.ok()); + CHECK_EQ(response.status, 200); + CHECK(response.body_length == strlen(expect)); + CHECK_EQ(memcmp(expect, response.body, response.body_length), 0); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); } @@ -183,7 +184,7 @@ void OnFinishExpectFailure(void* arg, grpc_error_handle error) { grpc_http_response response = request_state->response; gpr_log(GPR_INFO, "response status=%d error=%s", response.status, grpc_core::StatusToString(error).c_str()); - GPR_ASSERT(!error.ok()); + CHECK(!error.ok()); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); } @@ -197,7 +198,7 @@ TEST_F(HttpRequestTest, Get) { memset(&req, 0, sizeof(req)); auto uri = grpc_core::URI::Create("http", host, "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, pops(), &req, @@ -223,7 +224,7 @@ TEST_F(HttpRequestTest, Post) { req.body_length = 5; auto uri = grpc_core::URI::Create("http", host, "/post", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Post( std::move(*uri), nullptr /* channel args */, pops(), &req, @@ -252,8 +253,7 @@ void InjectNonResponsiveDNSServer(ares_channel* channel) { dns_server_addrs[0].tcp_port = g_fake_non_responsive_dns_server_port; dns_server_addrs[0].udp_port = g_fake_non_responsive_dns_server_port; dns_server_addrs[0].next = nullptr; - GPR_ASSERT(ares_set_servers_ports(*channel, dns_server_addrs) == - ARES_SUCCESS); + CHECK(ares_set_servers_ports(*channel, dns_server_addrs) == ARES_SUCCESS); } TEST_F(HttpRequestTest, CancelGetDuringDNSResolution) { @@ -280,7 +280,7 @@ TEST_F(HttpRequestTest, CancelGetDuringDNSResolution) { auto uri = grpc_core::URI::Create( "http", "dont-care-since-wont-be-resolved.test.com:443", "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, pops(), &req, @@ -336,7 +336,7 @@ TEST_F(HttpRequestTest, CancelGetWhileReadingResponse) { auto uri = grpc_core::URI::Create("http", fake_http_server_ptr->address(), "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, pops(), &req, @@ -397,7 +397,7 @@ TEST_F(HttpRequestTest, CancelGetRacesWithConnectionFailure) { auto uri = grpc_core::URI::Create("http", fake_server_address, "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, pops(), &req, @@ -462,7 +462,7 @@ TEST_F(HttpRequestTest, CallerPollentsAreNotReferencedAfterCallbackIsRan) { request_state.pollset_set_to_destroy_eagerly); auto uri = grpc_core::URI::Create("http", fake_server_address, "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, @@ -515,7 +515,7 @@ TEST_F(HttpRequestTest, memset(&req, 0, sizeof(req)); auto uri = grpc_core::URI::Create("http", host, "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), nullptr /* channel args */, pops(), &req, diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc index 2fb8271cb5a..7c0638dda29 100644 --- a/test/core/http/httpcli_test_util.cc +++ b/test/core/http/httpcli_test_util.cc @@ -22,6 +22,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" @@ -60,7 +61,7 @@ HttpRequestTestServer StartHttpRequestTestServer(int argc, char** argv, } else { root = gpr_strdup("."); } - GPR_ASSERT(argc <= 2); + CHECK_LE(argc, 2); if (argc == 2) { args.push_back(gpr_strdup(argv[1])); } else { @@ -92,7 +93,7 @@ HttpRequestTestServer StartHttpRequestTestServer(int argc, char** argv, } gpr_subprocess* server = gpr_subprocess_create(args.size(), const_cast(args.data())); - GPR_ASSERT(server); + CHECK(server); for (size_t i = 0; i < args.size(); i++) { gpr_free(args[i]); } diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 56cec9d1522..aa59097f9b1 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -28,6 +28,7 @@ #include +#include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" @@ -101,7 +102,7 @@ class HttpsCliTest : public ::testing::Test { void RunAndKick(const std::function& f) { grpc_core::MutexLockForGprMu lock(mu_); f(); - GPR_ASSERT(GRPC_LOG_IF_ERROR( + CHECK(GRPC_LOG_IF_ERROR( "pollset_kick", grpc_pollset_kick(grpc_polling_entity_pollset(&pops_), nullptr))); } @@ -109,9 +110,9 @@ class HttpsCliTest : public ::testing::Test { void PollUntil(const std::function& predicate, absl::Time deadline) { gpr_mu_lock(mu_); while (!predicate()) { - GPR_ASSERT(absl::Now() < deadline); + CHECK(absl::Now() < deadline); grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + CHECK(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pops_), &worker, NSecondsTime(1)))); gpr_mu_unlock(mu_); @@ -164,10 +165,10 @@ void OnFinish(void* arg, grpc_error_handle error) { grpc_http_response response = request_state->response; gpr_log(GPR_INFO, "response status=%d error=%s", response.status, grpc_core::StatusToString(error).c_str()); - GPR_ASSERT(error.ok()); - GPR_ASSERT(response.status == 200); - GPR_ASSERT(response.body_length == strlen(expect)); - GPR_ASSERT(0 == memcmp(expect, response.body, response.body_length)); + CHECK(error.ok()); + CHECK_EQ(response.status, 200); + CHECK(response.body_length == strlen(expect)); + CHECK_EQ(memcmp(expect, response.body, response.body_length), 0); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); } @@ -177,7 +178,7 @@ void OnFinishExpectFailure(void* arg, grpc_error_handle error) { grpc_http_response response = request_state->response; gpr_log(GPR_INFO, "response status=%d error=%s", response.status, grpc_core::StatusToString(error).c_str()); - GPR_ASSERT(!error.ok()); + CHECK(!error.ok()); request_state->test->RunAndKick( [request_state]() { request_state->done = true; }); } @@ -195,7 +196,7 @@ TEST_F(HttpsCliTest, Get) { grpc_channel_args args = {1, &ssl_override_arg}; auto uri = grpc_core::URI::Create("https", host, "/get", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Get( std::move(*uri), &args, pops(), &req, NSecondsTime(15), @@ -223,7 +224,7 @@ TEST_F(HttpsCliTest, Post) { grpc_channel_args args = {1, &ssl_override_arg}; auto uri = grpc_core::URI::Create("https", host, "/post", {} /* query params */, "" /* fragment */); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_core::OrphanablePtr http_request = grpc_core::HttpRequest::Post( std::move(*uri), &args /* channel args */, pops(), &req, diff --git a/test/core/json/BUILD b/test/core/json/BUILD index 9acdd8908c3..70d25aa7799 100644 --- a/test/core/json/BUILD +++ b/test/core/json/BUILD @@ -23,6 +23,7 @@ grpc_fuzzer( name = "json_fuzzer", srcs = ["fuzzer.cc"], corpus = "corpus", + external_deps = ["absl/log:check"], language = "C++", tags = ["no_windows"], deps = [ diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc index 97493aacbb1..557073d5744 100644 --- a/test/core/json/fuzzer.cc +++ b/test/core/json/fuzzer.cc @@ -19,6 +19,7 @@ #include #include +#include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -37,8 +38,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { if (json.ok()) { auto text2 = grpc_core::JsonDump(*json); auto json2 = grpc_core::JsonParse(text2); - GPR_ASSERT(json2.ok()); - GPR_ASSERT(*json == *json2); + CHECK(json2.ok()); + CHECK(*json == *json2); } return 0; } diff --git a/test/core/load_balancing/BUILD b/test/core/load_balancing/BUILD index 304e91c1325..606c9d36622 100644 --- a/test/core/load_balancing/BUILD +++ b/test/core/load_balancing/BUILD @@ -28,6 +28,7 @@ grpc_cc_library( testonly = True, hdrs = ["lb_policy_test_lib.h"], external_deps = [ + "absl/log:check", "gtest", ], language = "C++", @@ -191,6 +192,7 @@ grpc_cc_test( srcs = ["static_stride_scheduler_benchmark.cc"], external_deps = [ "absl/algorithm:container", + "absl/log:check", "benchmark", ], language = "C++", diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h index 9f2e0b113cd..3c57342e5d4 100644 --- a/test/core/load_balancing/lb_policy_test_lib.h +++ b/test/core/load_balancing/lb_policy_test_lib.h @@ -35,6 +35,7 @@ #include "absl/base/thread_annotations.h" #include "absl/functional/any_invocable.h" +#include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" @@ -195,14 +196,14 @@ class LoadBalancingPolicyTest : public ::testing::Test { auto* w = static_cast(watcher.get()); if (w->type() == OrcaProducer::Type()) { - GPR_ASSERT(orca_watcher_ == nullptr); + CHECK(orca_watcher_ == nullptr); orca_watcher_.reset(static_cast(watcher.release())); state_->orca_watchers_.insert(orca_watcher_.get()); } else if (w->type() == HealthProducer::Type()) { // TODO(roth): Support health checking in test framework. // For now, we just hard-code this to the raw connectivity state. - GPR_ASSERT(health_watcher_ == nullptr); - GPR_ASSERT(health_watcher_wrapper_ == nullptr); + CHECK(health_watcher_ == nullptr); + CHECK_EQ(health_watcher_wrapper_, nullptr); health_watcher_.reset(static_cast(watcher.release())); auto connectivity_watcher = health_watcher_->TakeWatcher(); auto* connectivity_watcher_ptr = connectivity_watcher.get(); @@ -562,7 +563,7 @@ class LoadBalancingPolicyTest : public ::testing::Test { auto it = test_->subchannel_pool_.find(key); if (it == test_->subchannel_pool_.end()) { auto address_uri = grpc_sockaddr_to_uri(&address); - GPR_ASSERT(address_uri.ok()); + CHECK(address_uri.ok()); it = test_->subchannel_pool_ .emplace(std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple(std::move(*address_uri), test_)) @@ -729,7 +730,7 @@ class LoadBalancingPolicyTest : public ::testing::Test { lb_policy_ = CoreConfiguration::Get().lb_policy_registry().CreateLoadBalancingPolicy( lb_policy_name_, std::move(args)); - GPR_ASSERT(lb_policy_ != nullptr); + CHECK(lb_policy_ != nullptr); } void TearDown() override { @@ -757,7 +758,7 @@ class LoadBalancingPolicyTest : public ::testing::Test { } LoadBalancingPolicy* lb_policy() const { - GPR_ASSERT(lb_policy_ != nullptr); + CHECK(lb_policy_ != nullptr); return lb_policy_.get(); } @@ -776,9 +777,9 @@ class LoadBalancingPolicyTest : public ::testing::Test { // Converts an address URI into a grpc_resolved_address. static grpc_resolved_address MakeAddress(absl::string_view address_uri) { auto uri = URI::Parse(address_uri); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_resolved_address address; - GPR_ASSERT(grpc_parse_uri(*uri, &address)); + CHECK(grpc_parse_uri(*uri, &address)); return address; } @@ -1222,7 +1223,7 @@ class LoadBalancingPolicyTest : public ::testing::Test { RefCountedPtr ExpectRoundRobinStartup( absl::Span endpoints, SourceLocation location = SourceLocation()) { - GPR_ASSERT(!endpoints.empty()); + CHECK(!endpoints.empty()); // There should be a subchannel for every address. // We will wind up connecting to the first address for every endpoint. std::vector> endpoint_subchannels; diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc index ef434d14275..ca882c63247 100644 --- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc +++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc @@ -22,6 +22,7 @@ #include #include "absl/algorithm/container.h" +#include "absl/log/check.h" #include "absl/random/random.h" #include "absl/types/optional.h" #include "absl/types/span.h" @@ -62,7 +63,7 @@ void BM_StaticStrideSchedulerPickNonAtomic(benchmark::State& state) { StaticStrideScheduler::Make( absl::MakeSpan(Weights()).subspan(0, state.range(0)), [&] { return sequence++; }); - GPR_ASSERT(scheduler.has_value()); + CHECK(scheduler.has_value()); for (auto s : state) { benchmark::DoNotOptimize(scheduler->Pick()); } @@ -77,7 +78,7 @@ void BM_StaticStrideSchedulerPickAtomic(benchmark::State& state) { StaticStrideScheduler::Make( absl::MakeSpan(Weights()).subspan(0, state.range(0)), [&] { return sequence.fetch_add(1, std::memory_order_relaxed); }); - GPR_ASSERT(scheduler.has_value()); + CHECK(scheduler.has_value()); for (auto s : state) { benchmark::DoNotOptimize(scheduler->Pick()); } @@ -93,7 +94,7 @@ void BM_StaticStrideSchedulerMake(benchmark::State& state) { StaticStrideScheduler::Make( absl::MakeSpan(Weights()).subspan(0, state.range(0)), [&] { return sequence++; }); - GPR_ASSERT(scheduler.has_value()); + CHECK(scheduler.has_value()); } } BENCHMARK(BM_StaticStrideSchedulerMake) diff --git a/test/core/network_benchmarks/BUILD b/test/core/network_benchmarks/BUILD index 2ac85a35d4a..68f1742a8d9 100644 --- a/test/core/network_benchmarks/BUILD +++ b/test/core/network_benchmarks/BUILD @@ -27,6 +27,7 @@ licenses(["notice"]) grpc_cc_binary( name = "low_level_ping_pong", srcs = ["low_level_ping_pong.cc"], + external_deps = ["absl/log:check"], language = "C++", tags = ["no_windows"], deps = [ diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 1ee173b9cac..65ad1f4916c 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -35,6 +35,8 @@ #endif #include +#include "absl/log/check.h" + #include #include #include @@ -122,8 +124,8 @@ static int poll_read_bytes(int fd, char* buf, size_t read_size, int spin) { } } if (err == 0 && spin) continue; - GPR_ASSERT(err == 1); - GPR_ASSERT(pfd.revents == POLLIN); + CHECK_EQ(err, 1); + CHECK(pfd.revents == POLLIN); do { err2 = read(fd, buf + bytes_read, read_size - bytes_read); } while (err2 < 0 && errno == EINTR); @@ -162,9 +164,9 @@ static int epoll_read_bytes(struct thread_args* args, char* buf, int spin) { return -1; } if (err == 0 && spin) continue; - GPR_ASSERT(err == 1); - GPR_ASSERT(ev.events & EPOLLIN); - GPR_ASSERT(ev.data.fd == args->fds.read_fd); + CHECK_EQ(err, 1); + CHECK(ev.events & EPOLLIN); + CHECK(ev.data.fd == args->fds.read_fd); do { do { err2 = @@ -176,7 +178,7 @@ static int epoll_read_bytes(struct thread_args* args, char* buf, int spin) { // done to ensure we see an EAGAIN } while (bytes_read < read_size); } while (bytes_read < read_size); - GPR_ASSERT(bytes_read == read_size); + CHECK(bytes_read == read_size); return 0; } diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD index ac99d1a9fcd..1daba2bad35 100644 --- a/test/core/promise/BUILD +++ b/test/core/promise/BUILD @@ -519,6 +519,7 @@ grpc_proto_fuzzer( corpus = "promise_fuzzer_corpus", external_deps = [ "absl/functional:any_invocable", + "absl/log:check", "absl/status", "absl/types:optional", ], diff --git a/test/core/promise/promise_fuzzer.cc b/test/core/promise/promise_fuzzer.cc index b87efba4003..d74ad045ec4 100644 --- a/test/core/promise/promise_fuzzer.cc +++ b/test/core/promise/promise_fuzzer.cc @@ -20,6 +20,7 @@ #include #include "absl/functional/any_invocable.h" +#include "absl/log/check.h" #include "absl/status/status.h" #include "absl/types/optional.h" @@ -64,10 +65,10 @@ class Fuzzer { Scheduler{this}, [this](absl::Status status) { // Must only be called once - GPR_ASSERT(!done_); + CHECK(!done_); // If we became certain of the eventual status, verify it. if (expected_status_.has_value()) { - GPR_ASSERT(status == *expected_status_); + CHECK(status == *expected_status_); } // Mark ourselves done. done_ = true; @@ -114,7 +115,7 @@ class Fuzzer { ExpectCancelled(); activity_.reset(); if (wakeup_ != nullptr) std::exchange(wakeup_, nullptr)(); - GPR_ASSERT(done_); + CHECK(done_); } private: @@ -127,9 +128,8 @@ class Fuzzer { explicit BoundScheduler(Scheduler scheduler) : fuzzer_(scheduler.fuzzer) {} void ScheduleWakeup() { - GPR_ASSERT(static_cast(this) == - fuzzer_->activity_.get()); - GPR_ASSERT(fuzzer_->wakeup_ == nullptr); + CHECK(static_cast(this) == fuzzer_->activity_.get()); + CHECK(fuzzer_->wakeup_ == nullptr); fuzzer_->wakeup_ = [this]() { static_cast(this)->RunScheduledWakeup(); }; diff --git a/test/core/resolver/BUILD b/test/core/resolver/BUILD index 020644df369..95b740b72e7 100644 --- a/test/core/resolver/BUILD +++ b/test/core/resolver/BUILD @@ -21,7 +21,10 @@ licenses(["notice"]) grpc_cc_test( name = "endpoint_addresses_test", srcs = ["endpoint_addresses_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc index 1f7564914e1..b4d21daf25d 100644 --- a/test/core/resolver/endpoint_addresses_test.cc +++ b/test/core/resolver/endpoint_addresses_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "gmock/gmock.h" @@ -38,9 +39,9 @@ namespace { grpc_resolved_address MakeAddress(absl::string_view address_uri) { auto uri = URI::Parse(address_uri); - GPR_ASSERT(uri.ok()); + CHECK(uri.ok()); grpc_resolved_address address; - GPR_ASSERT(grpc_parse_uri(*uri, &address)); + CHECK(grpc_parse_uri(*uri, &address)); return address; } diff --git a/test/core/resource_quota/BUILD b/test/core/resource_quota/BUILD index e1ed6851ed1..ca98b91a43b 100644 --- a/test/core/resource_quota/BUILD +++ b/test/core/resource_quota/BUILD @@ -46,6 +46,7 @@ grpc_cc_library( name = "call_checker", testonly = True, hdrs = ["call_checker.h"], + external_deps = ["absl/log:check"], language = "c++", deps = ["//:gpr"], ) diff --git a/test/core/resource_quota/call_checker.h b/test/core/resource_quota/call_checker.h index ecea5d8fb62..9157618956f 100644 --- a/test/core/resource_quota/call_checker.h +++ b/test/core/resource_quota/call_checker.h @@ -17,6 +17,8 @@ #include +#include "absl/log/check.h" + #include namespace grpc_core { @@ -33,11 +35,11 @@ class CallChecker { public: explicit CallChecker(bool optional) : optional_(optional) {} ~CallChecker() { - if (!optional_) GPR_ASSERT(called_); + if (!optional_) CHECK(called_); } void Called() { - GPR_ASSERT(!called_); + CHECK(!called_); called_ = true; } diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index a96bcc252b6..64eebd31bef 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -23,6 +23,7 @@ grpc_fuzzer( name = "percent_encode_fuzzer", srcs = ["percent_encode_fuzzer.cc"], corpus = "percent_encode_corpus", + external_deps = ["absl/log:check"], language = "C++", tags = ["no_windows"], deps = [ @@ -93,7 +94,10 @@ grpc_cc_test( grpc_cc_test( name = "slice_buffer_test", srcs = ["slice_buffer_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], uses_event_engine = False, uses_polling = False, deps = [ diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index 2e8f5fc7fa9..fc566f51db6 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -21,6 +21,8 @@ #include +#include "absl/log/check.h" + #include #include @@ -39,7 +41,7 @@ static void test(const uint8_t* data, size_t size, auto permissive_decoded_output = grpc_core::PermissivePercentDecodeSlice(std::move(output)); // decoded output must always match the input - GPR_ASSERT(input == permissive_decoded_output); + CHECK(input == permissive_decoded_output); grpc_shutdown(); } diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 7a64d6566af..3070b7a4a00 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -19,6 +19,7 @@ #include #include +#include "absl/log/check.h" #include "gtest/gtest.h" #include @@ -34,7 +35,7 @@ using ::grpc_core::SliceBuffer; static constexpr int kNewSliceLength = 100; Slice MakeSlice(size_t len) { - GPR_ASSERT(len > 0); + CHECK_GT(len, 0); unsigned char* contents = static_cast(gpr_malloc(len)); memset(contents, 'a', len); return Slice(grpc_slice_new(contents, len, gpr_free));