Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into tjagtap_src_core_lib

Browse Source
pull/36467/head
tanvi-jagtap 7 months ago
parent 7a588c08fe 60dc14e833
commit 7abfce472d
41 changed files with 210 additions and 139 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt
  2. 1
      build_autogenerated.yaml
  3. 6
      test/core/bad_ssl/bad_ssl_test.cc
  4. 6
      test/core/bad_ssl/generate_tests.bzl
  5. 18
      test/core/bad_ssl/server_common.cc
  6. 6
      test/core/bad_ssl/servers/alpn.cc
  7. 4
      test/core/bad_ssl/servers/cert.cc
  8. 6
      test/core/channel/BUILD
  9. 27
      test/core/channel/channel_args_test.cc
  10. 3
      test/core/channel/minimal_stack_is_minimal_test.cc
  11. 1
      test/core/ext/filters/event_engine_client_channel_resolver/BUILD
  12. 3
      test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
  13. 1
      test/core/gpr/BUILD
  14. 14
      test/core/gpr/log_test.cc
  15. 3
      test/core/gprpp/BUILD
  16. 8
      test/core/gprpp/chunked_vector_fuzzer.cc
  17. 5
      test/core/gprpp/dual_ref_counted_test.cc
  18. 7
      test/core/gprpp/ref_counted_ptr_test.cc
  19. 4
      test/core/handshake/BUILD
  20. 15
      test/core/handshake/server_ssl_common.cc
  21. 37
      test/core/handshake/verify_peer_options.cc
  22. 11
      test/core/http/BUILD
  23. 34
      test/core/http/httpcli_test.cc
  24. 5
      test/core/http/httpcli_test_util.cc
  25. 21
      test/core/http/httpscli_test.cc
  26. 1
      test/core/json/BUILD
  27. 5
      test/core/json/fuzzer.cc
  28. 2
      test/core/load_balancing/BUILD
  29. 19
      test/core/load_balancing/lb_policy_test_lib.h
  30. 7
      test/core/load_balancing/static_stride_scheduler_benchmark.cc
  31. 1
      test/core/network_benchmarks/BUILD
  32. 14
      test/core/network_benchmarks/low_level_ping_pong.cc
  33. 1
      test/core/promise/BUILD
  34. 12
      test/core/promise/promise_fuzzer.cc
  35. 5
      test/core/resolver/BUILD
  36. 5
      test/core/resolver/endpoint_addresses_test.cc
  37. 1
      test/core/resource_quota/BUILD
  38. 6
      test/core/resource_quota/call_checker.h
  39. 6
      test/core/slice/BUILD
  40. 4
      test/core/slice/percent_encode_fuzzer.cc
  41. 3
      test/core/slice/slice_buffer_test.cc

1
CMakeLists.txt generated
Unescape View File

@ -5930,6 +5930,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

1
build_autogenerated.yaml generated
Unescape View File

@ -5173,6 +5173,7 @@ targets:
- test/core/load_balancing/static_stride_scheduler_benchmark.cc
deps:
- absl/algorithm:container
- absl/log:check
- absl/types:span
- benchmark
- gpr

6
test/core/bad_ssl/bad_ssl_test.cc
Unescape View File

@ -21,6 +21,8 @@
#include <string>
#include "absl/log/check.h"
#include <grpc/credentials.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
@ -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);

6
test/core/bad_ssl/generate_tests.bzl
Unescape View File

@ -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",

18
test/core/bad_ssl/server_common.cc
Unescape View File

@ -20,6 +20,8 @@
#include <signal.h>
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpc/support/time.h>
@ -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<void*>(1));
GPR_ASSERT(GRPC_CALL_OK == error);
CHECK_EQ(error, GRPC_CALL_OK);
signal(SIGINT, sigint_handler);
while (!shutdown_finished) {
@ -75,8 +77,8 @@ 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),
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);
@ -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);
}

6
test/core/bad_ssl/servers/alpn.cc
Unescape View File

@ -20,6 +20,8 @@
#include <string.h>
#include "absl/log/check.h"
#include <grpc/credentials.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
@ -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);

4
test/core/bad_ssl/servers/cert.cc
Unescape View File

@ -16,6 +16,8 @@
//
//
#include "absl/log/check.h"
#include <grpc/credentials.h>
#include <grpc/grpc.h>
#include <grpc/grpc_security.h>
@ -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);

6
test/core/channel/BUILD
Unescape View File

@ -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++",

27
test/core/channel/channel_args_test.cc
Unescape View File

@ -20,6 +20,7 @@
#include <string.h>
#include "absl/log/check.h"
#include "gtest/gtest.h"
#include <grpc/credentials.h>
@ -254,15 +255,14 @@ TEST(GrpcChannelArgsTest, Create) {
const_cast<char*>("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,
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);
GPR_ASSERT(
grpc_channel_args_find(old_args, "arg_pointer")->value.pointer.vtable ==
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(

3
test/core/channel/minimal_stack_is_minimal_test.cc
Unescape View File

@ -34,6 +34,7 @@
#include <string>
#include <vector>
#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<std::string> 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));
}

1
test/core/ext/filters/event_engine_client_channel_resolver/BUILD
Unescape View File

@ -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 = [

3
test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
Unescape View File

@ -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<grpc_core::WorkSerializer> 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;

1
test/core/gpr/BUILD
Unescape View File

@ -61,6 +61,7 @@ grpc_cc_test(
name = "log_test",
srcs = ["log_test.cc"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",

14
test/core/gpr/log_test.cc
Unescape View File

@ -22,6 +22,8 @@
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include <grpc/support/log.h>
#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);

3
test/core/gprpp/BUILD
Unescape View File

@ -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"],

8
test/core/gprpp/chunked_vector_fuzzer.cc
Unescape View File

@ -20,6 +20,8 @@
#include <utility>
#include <vector>
#include "absl/log/check.h"
#include <grpc/event_engine/memory_allocator.h>
#include <grpc/support/log.h>
@ -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());
}
};

5
test/core/gprpp/dual_ref_counted_test.cc
Unescape View File

@ -18,6 +18,7 @@
#include <memory>
#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<Foo> {
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<FooWithTracing> {
public:
FooWithTracing() : DualRefCounted("FooWithTracing") {}
~FooWithTracing() override { GPR_ASSERT(shutting_down_); }
~FooWithTracing() override { CHECK(shutting_down_); }
void Orphaned() override { shutting_down_ = true; }

7
test/core/gprpp/ref_counted_ptr_test.cc
Unescape View File

@ -21,6 +21,7 @@
#include <memory>
#include "absl/container/flat_hash_set.h"
#include "absl/log/check.h"
#include "gtest/gtest.h"
#include <grpc/support/log.h>
@ -274,7 +275,7 @@ class Bar : public DualRefCounted<Bar> {
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<BarWithTracing> {
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<WeakBaseClass> {
public:
WeakBaseClass() {}
~WeakBaseClass() override { GPR_ASSERT(shutting_down_); }
~WeakBaseClass() override { CHECK(shutting_down_); }
void Orphaned() override { shutting_down_ = true; }

4
test/core/handshake/BUILD
Unescape View File

@ -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 = [

15
test/core/handshake/server_ssl_common.cc
Unescape View File

@ -34,6 +34,7 @@
#include <openssl/ssl.h>
#include "absl/base/thread_annotations.h"
#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include <grpc/credentials.h>
@ -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);

37
test/core/handshake/verify_peer_options.cc
Unescape View File

@ -32,6 +32,7 @@
#include <openssl/err.h>
#include <openssl/ssl.h>
#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include <grpc/credentials.h>
@ -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,11 +147,11 @@ 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(
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
@ -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<void*>(&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<void*>(&userdata));
GPR_ASSERT(destruct_userdata == static_cast<void*>(&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<void*>(&userdata));
CHECK(destruct_userdata == static_cast<void*>(&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;

11
test/core/http/BUILD
Unescape View File

@ -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 = [

34
test/core/http/httpcli_test.cc
Unescape View File

@ -29,6 +29,7 @@
#include <ares.h>
#include <gtest/gtest.h>
#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<void()>& 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<bool()>& 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> http_request =
grpc_core::HttpRequest::Get(
std::move(*uri), nullptr /* channel args */, pops(), &req,

5
test/core/http/httpcli_test_util.cc
Unescape View File

@ -22,6 +22,7 @@
#include <string>
#include <vector>
#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<const char**>(args.data()));
GPR_ASSERT(server);
CHECK(server);
for (size_t i = 0; i < args.size(); i++) {
gpr_free(args[i]);
}

21
test/core/http/httpscli_test.cc
Unescape View File

@ -28,6 +28,7 @@
#include <gtest/gtest.h>
#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<void()>& 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<bool()>& 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<grpc_core::HttpRequest> 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<grpc_core::HttpRequest> http_request =
grpc_core::HttpRequest::Post(
std::move(*uri), &args /* channel args */, pops(), &req,

1
test/core/json/BUILD
Unescape View File

@ -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 = [

5
test/core/json/fuzzer.cc
Unescape View File

@ -19,6 +19,7 @@
#include <stdint.h>
#include <string.h>
#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;
}

2
test/core/load_balancing/BUILD
Unescape View File

@ -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++",

19
test/core/load_balancing/lb_policy_test_lib.h
Unescape View File

@ -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<InternalSubchannelDataWatcherInterface*>(watcher.get());
if (w->type() == OrcaProducer::Type()) {
GPR_ASSERT(orca_watcher_ == nullptr);
CHECK(orca_watcher_ == nullptr);
orca_watcher_.reset(static_cast<OrcaWatcher*>(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<HealthWatcher*>(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<LoadBalancingPolicy::SubchannelPicker> ExpectRoundRobinStartup(
absl::Span<const EndpointAddresses> 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<std::vector<SubchannelState*>> endpoint_subchannels;

7
test/core/load_balancing/static_stride_scheduler_benchmark.cc
Unescape View File

@ -22,6 +22,7 @@
#include <benchmark/benchmark.h>
#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)

1
test/core/network_benchmarks/BUILD
Unescape View File

@ -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 = [

14
test/core/network_benchmarks/low_level_ping_pong.cc
Unescape View File

@ -35,6 +35,8 @@
#endif
#include <sys/socket.h>
#include "absl/log/check.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/time.h>
@ -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;
}

1
test/core/promise/BUILD
Unescape View File

@ -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",
],

12
test/core/promise/promise_fuzzer.cc
Unescape View File

@ -20,6 +20,7 @@
#include <vector>
#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<ActivityType*>(this) ==
fuzzer_->activity_.get());
GPR_ASSERT(fuzzer_->wakeup_ == nullptr);
CHECK(static_cast<ActivityType*>(this) == fuzzer_->activity_.get());
CHECK(fuzzer_->wakeup_ == nullptr);
fuzzer_->wakeup_ = [this]() {
static_cast<ActivityType*>(this)->RunScheduledWakeup();
};

5
test/core/resolver/BUILD
Unescape View File

@ -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,

5
test/core/resolver/endpoint_addresses_test.cc
Unescape View File

@ -18,6 +18,7 @@
#include <set>
#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;
}

1
test/core/resource_quota/BUILD
Unescape View File

@ -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"],
)

6
test/core/resource_quota/call_checker.h
Unescape View File

@ -17,6 +17,8 @@
#include <memory>
#include "absl/log/check.h"
#include <grpc/support/log.h>
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;
}

6
test/core/slice/BUILD
Unescape View File

@ -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 = [

4
test/core/slice/percent_encode_fuzzer.cc
Unescape View File

@ -21,6 +21,8 @@
#include <utility>
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -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();
}

3
test/core/slice/slice_buffer_test.cc
Unescape View File

@ -19,6 +19,7 @@
#include <memory>
#include <utility>
#include "absl/log/check.h"
#include "gtest/gtest.h"
#include <grpc/slice.h>
@ -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<unsigned char*>(gpr_malloc(len));
memset(contents, 'a', len);
return Slice(grpc_slice_new(contents, len, gpr_free));

Write Preview
Loading…
Cancel
Save