From 4fdd2a8786e08977a606a128d96cf7f3821de66e Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Wed, 24 Apr 2024 19:23:45 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36436) [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 #36436 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36436 from tanvi-jagtap:tjagtap_core_transport 8e25f5ae7bc12be334ada37e16c59e401b3c853a PiperOrigin-RevId: 627925972 --- CMakeLists.txt | 1 + build_autogenerated.yaml | 1 + test/core/transport/BUILD | 1 + test/core/transport/binder/end2end/BUILD | 2 +- test/core/transport/binder/end2end/fuzzers/BUILD | 3 +++ .../binder/end2end/fuzzers/client_fuzzer.cc | 7 ++++--- .../transport/binder/end2end/fuzzers/fuzzer_utils.cc | 4 +++- .../binder/end2end/fuzzers/server_fuzzer.cc | 12 +++++++----- .../binder/end2end/testing_channel_create.cc | 6 ++++-- test/core/transport/chaotic_good/BUILD | 3 +++ .../chaotic_good/chaotic_good_server_test.cc | 9 +++++---- test/core/transport/chaotic_good/frame_fuzzer.cc | 11 ++++++----- test/core/transport/chaotic_good/frame_test.cc | 11 ++++++----- test/core/transport/chttp2/flow_control_fuzzer.cc | 2 +- .../chttp2/remove_stream_from_stalled_lists_test.cc | 2 +- ...ream_leak_with_queued_flow_control_update_test.cc | 4 ++-- test/core/transport/chttp2/streams_not_seen_test.cc | 2 +- test/core/transport/chttp2/too_many_pings_test.cc | 6 +++--- test/core/transport/parsed_metadata_test.cc | 7 ++++--- test/core/transport/test_suite/BUILD | 5 ++++- .../transport/test_suite/chaotic_good_fixture.cc | 7 ++++--- test/core/transport/test_suite/fuzzer_main.cc | 8 +++++--- .../transport/test_suite/grpc_transport_test.bzl | 1 + 23 files changed, 71 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f227cddcb6a..45e18642f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21368,6 +21368,7 @@ target_include_directories(parsed_metadata_test target_link_libraries(parsed_metadata_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index ca6c1d501a7..1366ec5ec02 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -14062,6 +14062,7 @@ targets: - test/core/transport/parsed_metadata_test.cc deps: - gtest + - absl/log:check - grpc_test_util - name: parser_test gtest: true diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD index 519f3c3bc38..c52a096f429 100644 --- a/test/core/transport/BUILD +++ b/test/core/transport/BUILD @@ -116,6 +116,7 @@ grpc_cc_test( name = "parsed_metadata_test", srcs = ["parsed_metadata_test.cc"], external_deps = [ + "absl/log:check", "gtest", ], language = "C++", diff --git a/test/core/transport/binder/end2end/BUILD b/test/core/transport/binder/end2end/BUILD index 30605e19fdf..cfc9a7f9614 100644 --- a/test/core/transport/binder/end2end/BUILD +++ b/test/core/transport/binder/end2end/BUILD @@ -63,7 +63,7 @@ grpc_cc_library( testonly = 1, srcs = ["testing_channel_create.cc"], hdrs = ["testing_channel_create.h"], - external_deps = [], + external_deps = ["absl/log:check"], deps = [ ":fake_binder", "//:grpc++_base", diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD index 85427723f08..bf8593e2cc7 100644 --- a/test/core/transport/binder/end2end/fuzzers/BUILD +++ b/test/core/transport/binder/end2end/fuzzers/BUILD @@ -35,6 +35,7 @@ grpc_proto_library( grpc_cc_library( name = "fuzzer_utils", srcs = ["fuzzer_utils.cc"], + external_deps = ["absl/log:check"], language = "c++", public_hdrs = ["fuzzer_utils.h"], deps = [ @@ -53,6 +54,7 @@ grpc_proto_fuzzer( "client_fuzzer.cc", ], corpus = "binder_transport_client_fuzzer_corpus", + external_deps = ["absl/log:check"], owner = "binder", proto = "client.proto", tags = [ @@ -76,6 +78,7 @@ grpc_proto_fuzzer( "server_fuzzer.cc", ], corpus = "binder_transport_server_fuzzer_corpus", + external_deps = ["absl/log:check"], owner = "binder", proto = "server.proto", tags = [ diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc index dc1f3887110..fb194663f58 100644 --- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc @@ -15,6 +15,7 @@ #include #include +#include "absl/log/check.h" #include "absl/memory/memory.h" #include @@ -110,7 +111,7 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_call_error error = grpc_call_start_batch( call, ops, static_cast(op - ops), tag(1), nullptr); int requested_calls = 1; - GPR_ASSERT(GRPC_CALL_OK == error); + CHECK_EQ(error, GRPC_CALL_OK); grpc_event ev; while (true) { grpc_core::ExecCtx::Get()->Flush(); @@ -135,13 +136,13 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { for (int i = 0; i < requested_calls; i++) { ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + CHECK(ev.type == GRPC_OP_COMPLETE); } grpc_completion_queue_shutdown(cq); for (int i = 0; i < requested_calls; i++) { ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME), nullptr); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + CHECK(ev.type == GRPC_QUEUE_SHUTDOWN); } grpc_call_unref(call); grpc_completion_queue_destroy(cq); diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc index 7575a0e56ba..74d9f65665e 100644 --- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc +++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc @@ -14,6 +14,8 @@ #include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h" +#include "absl/log/check.h" + namespace grpc_binder { namespace fuzzing { @@ -23,7 +25,7 @@ std::thread* g_fuzzing_thread = nullptr; template void CreateFuzzingThread(Args&&... args) { - GPR_ASSERT(g_fuzzing_thread == nullptr); + CHECK_EQ(g_fuzzing_thread, nullptr); g_fuzzing_thread = new std::thread(std::forward(args)...); } diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc index 4472291cb7b..48ce0e6fcea 100644 --- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "absl/log/check.h" + #include #include "src/core/ext/transport/binder/transport/binder_transport.h" @@ -62,9 +64,9 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_metadata_array_init(&request_metadata1); int requested_calls = 0; - GPR_ASSERT(GRPC_CALL_OK == - grpc_server_request_call(server, &call1, &call_details1, - &request_metadata1, cq, cq, tag(1))); + CHECK(GRPC_CALL_OK == + grpc_server_request_call(server, &call1, &call_details1, + &request_metadata1, cq, cq, tag(1))); requested_calls++; grpc_event ev; @@ -111,7 +113,7 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_core::ExecCtx::Get()->InvalidateNow(); } while (ev.type != GRPC_OP_COMPLETE && grpc_core::Timestamp::Now() < deadline); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + CHECK(ev.type == GRPC_OP_COMPLETE); } grpc_completion_queue_shutdown(cq); for (int i = 0; i <= requested_calls; i++) { @@ -121,7 +123,7 @@ DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) { grpc_core::ExecCtx::Get()->InvalidateNow(); } while (ev.type != GRPC_QUEUE_SHUTDOWN && grpc_core::Timestamp::Now() < deadline); - GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); + CHECK(ev.type == GRPC_QUEUE_SHUTDOWN); } grpc_server_destroy(server); grpc_completion_queue_destroy(cq); diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc index 1823498bf26..50d9470960e 100644 --- a/test/core/transport/binder/end2end/testing_channel_create.cc +++ b/test/core/transport/binder/end2end/testing_channel_create.cc @@ -16,6 +16,8 @@ #include +#include "absl/log/check.h" + #include #include "src/core/ext/transport/binder/transport/binder_transport.h" @@ -124,9 +126,9 @@ grpc_channel* grpc_binder_channel_create_for_testing( grpc_binder::end2end_testing::CreateClientServerBindersPairForTesting(); grpc_error_handle error = grpc_core::Server::FromC(server)->SetupTransport( server_transport, nullptr, server_args, nullptr); - GPR_ASSERT(error.ok()); + CHECK_OK(error); auto channel = grpc_core::ChannelCreate( "binder", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport); - GPR_ASSERT(channel.ok()); + CHECK_OK(channel); return channel->release()->c_ptr(); } diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD index c288be7ade5..0a61bcfb488 100644 --- a/test/core/transport/chaotic_good/BUILD +++ b/test/core/transport/chaotic_good/BUILD @@ -77,6 +77,7 @@ grpc_cc_test( name = "frame_test", srcs = ["frame_test.cc"], external_deps = [ + "absl/log:check", "absl/random", "absl/status", "absl/status:statusor", @@ -93,6 +94,7 @@ grpc_proto_fuzzer( srcs = ["frame_fuzzer.cc"], corpus = "frame_fuzzer_corpus", external_deps = [ + "absl/log:check", "absl/random:bit_gen_ref", "absl/status:statusor", ], @@ -221,6 +223,7 @@ grpc_cc_test( name = "chaotic_good_server_test", srcs = ["chaotic_good_server_test.cc"], external_deps = [ + "absl/log:check", "absl/strings", "absl/time", "gtest", diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc index 674e2639bb3..db17dfa2b56 100644 --- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc +++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc @@ -18,6 +18,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_cat.h" #include "absl/time/time.h" #include "gmock/gmock.h" @@ -66,8 +67,8 @@ class ChaoticGoodServerTest : public ::testing::Test { auto ev = grpc_completion_queue_pluck( shutdown_cq, nullptr, grpc_timeout_milliseconds_to_deadline(15000), nullptr); - GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); - GPR_ASSERT(ev.tag == nullptr); + CHECK(ev.type == GRPC_OP_COMPLETE); + CHECK_EQ(ev.tag, nullptr); grpc_completion_queue_destroy(shutdown_cq); grpc_server_destroy(server_); } @@ -82,8 +83,8 @@ class ChaoticGoodServerTest : public ::testing::Test { void ConstructConnector() { auto uri = URI::Parse("ipv6:" + addr_); - GPR_ASSERT(uri.ok()); - GPR_ASSERT(grpc_parse_uri(*uri, &resolved_addr_)); + CHECK_OK(uri); + CHECK(grpc_parse_uri(*uri, &resolved_addr_)); args_.address = &resolved_addr_; args_.deadline = Timestamp::Now() + Duration::Seconds(5); args_.channel_args = channel_args(); diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc index b5a09ab1d80..ff2a7619922 100644 --- a/test/core/transport/chaotic_good/frame_fuzzer.cc +++ b/test/core/transport/chaotic_good/frame_fuzzer.cc @@ -18,6 +18,7 @@ #include #include +#include "absl/log/check.h" #include "absl/random/bit_gen_ref.h" #include "absl/status/statusor.h" @@ -55,8 +56,8 @@ template void AssertRoundTrips(const T& input, FrameType expected_frame_type) { HPackCompressor hpack_compressor; auto serialized = input.Serialize(&hpack_compressor); - GPR_ASSERT(serialized.control.Length() >= - 24); // Initial output buffer size is 64 byte. + CHECK(serialized.control.Length() >= + 24); // Initial output buffer size is 64 byte. uint8_t header_bytes[24]; serialized.control.MoveFirstNBytesIntoBuffer(24, header_bytes); auto header = FrameHeader::Parse(header_bytes); @@ -67,15 +68,15 @@ void AssertRoundTrips(const T& input, FrameType expected_frame_type) { } Crash("Failed to parse header"); } - GPR_ASSERT(header->type == expected_frame_type); + CHECK(header->type == expected_frame_type); T output; HPackParser hpack_parser; DeterministicBitGen bitgen; auto deser = output.Deserialize(&hpack_parser, header.value(), absl::BitGenRef(bitgen), GetContext(), std::move(serialized), FuzzerFrameLimits()); - GPR_ASSERT(deser.ok()); - GPR_ASSERT(output == input); + CHECK_OK(deser); + CHECK(output == input); } template diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc index e29df6536cd..15389751a76 100644 --- a/test/core/transport/chaotic_good/frame_test.cc +++ b/test/core/transport/chaotic_good/frame_test.cc @@ -16,6 +16,7 @@ #include +#include "absl/log/check.h" #include "absl/random/random.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -34,15 +35,15 @@ template void AssertRoundTrips(const T& input, FrameType expected_frame_type) { HPackCompressor hpack_compressor; auto serialized = input.Serialize(&hpack_compressor); - GPR_ASSERT(serialized.control.Length() >= - 24); // Initial output buffer size is 64 byte. + CHECK_GE(serialized.control.Length(), + 24); // Initial output buffer size is 64 byte. uint8_t header_bytes[24]; serialized.control.MoveFirstNBytesIntoBuffer(24, header_bytes); auto header = FrameHeader::Parse(header_bytes); if (!header.ok()) { Crash("Failed to parse header"); } - GPR_ASSERT(header->type == expected_frame_type); + CHECK(header->type == expected_frame_type); T output; HPackParser hpack_parser; absl::BitGen bitgen; @@ -53,8 +54,8 @@ void AssertRoundTrips(const T& input, FrameType expected_frame_type) { auto deser = output.Deserialize(&hpack_parser, header.value(), absl::BitGenRef(bitgen), arena.get(), std::move(serialized), TestFrameLimits()); - GPR_ASSERT(deser.ok()); - GPR_ASSERT(output == input); + CHECK_OK(deser); + CHECK(output == input); } TEST(FrameTest, SettingsFrameRoundTrips) { diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc index f599331d818..2b802704208 100644 --- a/test/core/transport/chttp2/flow_control_fuzzer.cc +++ b/test/core/transport/chttp2/flow_control_fuzzer.cc @@ -246,7 +246,7 @@ void FlowControlFuzzer::Perform(const flow_control_fuzzer::Action& action) { bdp->AddIncomingBytes(stream_write.size); } StreamFlowControl::IncomingUpdateContext upd(&stream->fc); - CHECK(upd.RecvData(stream_write.size).ok()); + CHECK_OK(upd.RecvData(stream_write.size)); PerformAction(upd.MakeAction(), stream); } send_from_remote_.pop_front(); diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc index 3cdb2d9940f..7312bd27b78 100644 --- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc +++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc @@ -200,7 +200,7 @@ class TestServer { grpc_call_error error = grpc_server_request_call( server_, &call, &call_details, &request_metadata_recv, call_cq, cq_, request_call_tag); - CHECK(error == GRPC_CALL_OK); + CHECK_EQ(error, GRPC_CALL_OK); } } grpc_event event = grpc_completion_queue_next( diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc index 423ed40e584..c60ff6e240a 100644 --- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc +++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc @@ -80,7 +80,7 @@ class TestServer { grpc_call* call; grpc_call_error error = grpc_server_request_call( server_, &call, &call_details, &request_metadata_recv, cq_, cq_, tag); - CHECK(error == GRPC_CALL_OK); + CHECK_EQ(error, GRPC_CALL_OK); grpc_event event = grpc_completion_queue_next( cq_, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); CHECK(event.type == GRPC_OP_COMPLETE); @@ -112,7 +112,7 @@ class TestServer { op++; error = grpc_call_start_batch(call, ops, static_cast(op - ops), tag, nullptr); - CHECK(error == GRPC_CALL_OK); + CHECK_EQ(error, GRPC_CALL_OK); event = grpc_completion_queue_next(cq_, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr); CHECK(event.type == GRPC_OP_COMPLETE); diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc index fe1626d48f4..55719646187 100644 --- a/test/core/transport/chttp2/streams_not_seen_test.cc +++ b/test/core/transport/chttp2/streams_not_seen_test.cc @@ -365,7 +365,7 @@ class StreamsNotSeenTest : public ::testing::Test { } static void OnWriteDone(void* arg, grpc_error_handle error) { - CHECK(error.ok()); + CHECK_OK(error); Notification* on_write_done_notification_ = static_cast(arg); on_write_done_notification_->Notify(); } diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc index 474e2edb4b3..956cab7d394 100644 --- a/test/core/transport/chttp2/too_many_pings_test.cc +++ b/test/core/transport/chttp2/too_many_pings_test.cc @@ -442,7 +442,7 @@ grpc_core::Resolver::Result BuildResolverResult( if (!uri.ok()) { gpr_log(GPR_ERROR, "Failed to parse uri. Error: %s", uri.status().ToString().c_str()); - CHECK(uri.ok()); + CHECK_OK(uri); } grpc_resolved_address address; CHECK(grpc_parse_uri(*uri, &address)); @@ -702,8 +702,8 @@ void PerformCallWithResponsePayload(grpc_channel* channel, grpc_server* server, cqv.Verify(); CHECK(status == GRPC_STATUS_OK); - CHECK(0 == grpc_slice_str_cmp(details, "xyz")); - CHECK(0 == grpc_slice_str_cmp(call_details.method, "/foo")); + CHECK_EQ(grpc_slice_str_cmp(details, "xyz"), 0); + CHECK_EQ(grpc_slice_str_cmp(call_details.method, "/foo"), 0); CHECK_EQ(was_cancelled, 0); CHECK(byte_buffer_eq_slice(response_payload_recv, response_payload_slice)); diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc index 458df652bb4..3b54fe2b535 100644 --- a/test/core/transport/parsed_metadata_test.cc +++ b/test/core/transport/parsed_metadata_test.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/check.h" #include "absl/strings/numbers.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -55,7 +56,7 @@ struct Int32Trait { static int32_t MementoToValue(int32_t memento) { return memento; } static int32_t ParseMemento(Slice slice, bool, MetadataParseErrorFn) { int32_t out; - GPR_ASSERT(absl::SimpleAtoi(slice.as_string_view(), &out)); + CHECK(absl::SimpleAtoi(slice.as_string_view(), &out)); return out; } static std::string DisplayValue(int32_t value) { @@ -75,7 +76,7 @@ struct Int64Trait { static int64_t MementoToValue(int64_t memento) { return -memento; } static int64_t ParseMemento(Slice slice, bool, MetadataParseErrorFn) { int64_t out; - GPR_ASSERT(absl::SimpleAtoi(slice.as_string_view(), &out)); + CHECK(absl::SimpleAtoi(slice.as_string_view(), &out)); return out; } static std::string DisplayValue(int64_t value) { @@ -95,7 +96,7 @@ struct IntptrTrait { static intptr_t MementoToValue(intptr_t memento) { return memento / 2; } static intptr_t ParseMemento(Slice slice, bool, MetadataParseErrorFn) { intptr_t out; - GPR_ASSERT(absl::SimpleAtoi(slice.as_string_view(), &out)); + CHECK(absl::SimpleAtoi(slice.as_string_view(), &out)); return out; } static std::string DisplayValue(intptr_t value) { diff --git a/test/core/transport/test_suite/BUILD b/test/core/transport/test_suite/BUILD index 4bc8d7fcaa2..c42b8c6ece4 100644 --- a/test/core/transport/test_suite/BUILD +++ b/test/core/transport/test_suite/BUILD @@ -48,7 +48,10 @@ grpc_cc_library( name = "chaotic_good_fixture", testonly = 1, srcs = ["chaotic_good_fixture.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/log:check", + "gtest", + ], deps = [ "fixture", "//src/core:chaotic_good_client_transport", diff --git a/test/core/transport/test_suite/chaotic_good_fixture.cc b/test/core/transport/test_suite/chaotic_good_fixture.cc index d13ac3964bb..e1e0baff5e9 100644 --- a/test/core/transport/test_suite/chaotic_good_fixture.cc +++ b/test/core/transport/test_suite/chaotic_good_fixture.cc @@ -14,6 +14,7 @@ #include +#include "absl/log/check.h" #include "gmock/gmock.h" #include "src/core/ext/transport/chaotic_good/client_transport.h" @@ -67,13 +68,13 @@ EndpointPair CreateEndpointPair( [](absl::Status) {}, endpoint_config, std::make_unique( resource_quota->memory_quota())); - GPR_ASSERT(listener->Bind(resolved_address).ok()); - GPR_ASSERT(listener->Start().ok()); + CHECK_OK(listener->Bind(resolved_address)); + CHECK_OK(listener->Start()); event_engine->Connect( [&client_endpoint]( absl::StatusOr> endpoint) { - GPR_ASSERT(endpoint.ok()); + CHECK_OK(endpoint); client_endpoint = std::move(endpoint).value(); }, resolved_address, endpoint_config, diff --git a/test/core/transport/test_suite/fuzzer_main.cc b/test/core/transport/test_suite/fuzzer_main.cc index 3ee0fc65297..45a73e97afc 100644 --- a/test/core/transport/test_suite/fuzzer_main.cc +++ b/test/core/transport/test_suite/fuzzer_main.cc @@ -16,6 +16,8 @@ #include +#include "absl/log/check.h" + #include #include @@ -37,8 +39,8 @@ static void dont_log(gpr_log_func_args* /*args*/) {} DEFINE_PROTO_FUZZER(const transport_test_suite::Msg& msg) { const auto& tests = grpc_core::TransportTestRegistry::Get().tests(); const auto& fixtures = grpc_core::TransportFixtureRegistry::Get().fixtures(); - GPR_ASSERT(!tests.empty()); - GPR_ASSERT(!fixtures.empty()); + CHECK(!tests.empty()); + CHECK(!fixtures.empty()); const int test_id = msg.test_id() % tests.size(); const int fixture_id = msg.fixture_id() % fixtures.size(); @@ -62,5 +64,5 @@ DEFINE_PROTO_FUZZER(const transport_test_suite::Msg& msg) { msg.event_engine_actions(), bitgen); test->RunTest(); delete test; - GPR_ASSERT(!::testing::Test::HasFailure()); + CHECK(!::testing::Test::HasFailure()); } diff --git a/test/core/transport/test_suite/grpc_transport_test.bzl b/test/core/transport/test_suite/grpc_transport_test.bzl index 071b02e48e3..9bd94d33e79 100644 --- a/test/core/transport/test_suite/grpc_transport_test.bzl +++ b/test/core/transport/test_suite/grpc_transport_test.bzl @@ -35,6 +35,7 @@ def grpc_transport_test(name, deps): srcs = ["fuzzer_main.cc"], tags = ["no_windows", "no_mac"], external_deps = [ + "absl/log:check", "gtest", ], deps = [