diff options
author | ncteisen <ncteisen@gmail.com> | 2018-06-19 17:09:53 -0700 |
---|---|---|
committer | ncteisen <ncteisen@gmail.com> | 2018-06-19 17:09:53 -0700 |
commit | 1ab1287ac77972bee4e2f516d81230a7f0044f14 (patch) | |
tree | 91002eb81291193e2e2b61e7e64f97cbd706963d /test/core | |
parent | 0f20212d38f7f55229467f26293a5e2b3f39d5a0 (diff) |
Reviewer feedback
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/channel/channel_trace_test.cc | 10 | ||||
-rw-r--r-- | test/core/channel/channelz_test.cc | 3 | ||||
-rw-r--r-- | test/core/end2end/tests/channelz.cc | 46 |
3 files changed, 10 insertions, 49 deletions
diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc index e1bde4e6d4..bbddee3f14 100644 --- a/test/core/channel/channel_trace_test.cc +++ b/test/core/channel/channel_trace_test.cc @@ -157,7 +157,7 @@ TEST_P(ChannelTracerTest, ComplexTest) { AddSimpleTrace(&tracer); ChannelFixture channel1(GetParam()); RefCountedPtr<ChannelNode> sc1 = - MakeRefCounted<ChannelNode>(true, channel1.channel(), GetParam()); + MakeRefCounted<ChannelNode>(channel1.channel(), GetParam()); tracer.AddTraceEventReferencingSubchannel( ChannelTrace::Severity::Info, grpc_slice_from_static_string("subchannel one created"), sc1); @@ -175,7 +175,7 @@ TEST_P(ChannelTracerTest, ComplexTest) { ValidateChannelTrace(&tracer, 5, GetParam()); ChannelFixture channel2(GetParam()); RefCountedPtr<ChannelNode> sc2 = - MakeRefCounted<ChannelNode>(true, channel2.channel(), GetParam()); + MakeRefCounted<ChannelNode>(channel2.channel(), GetParam()); tracer.AddTraceEventReferencingChannel( ChannelTrace::Severity::Info, grpc_slice_from_static_string("LB channel two created"), sc2); @@ -204,7 +204,7 @@ TEST_P(ChannelTracerTest, TestNesting) { ValidateChannelTrace(&tracer, 2, GetParam()); ChannelFixture channel1(GetParam()); RefCountedPtr<ChannelNode> sc1 = - MakeRefCounted<ChannelNode>(true, channel1.channel(), GetParam()); + MakeRefCounted<ChannelNode>(channel1.channel(), GetParam()); tracer.AddTraceEventReferencingChannel( ChannelTrace::Severity::Info, grpc_slice_from_static_string("subchannel one created"), sc1); @@ -212,7 +212,7 @@ TEST_P(ChannelTracerTest, TestNesting) { AddSimpleTrace(sc1->trace()); ChannelFixture channel2(GetParam()); RefCountedPtr<ChannelNode> conn1 = - MakeRefCounted<ChannelNode>(true, channel2.channel(), GetParam()); + MakeRefCounted<ChannelNode>(channel2.channel(), GetParam()); // nesting one level deeper. sc1->trace()->AddTraceEventReferencingSubchannel( ChannelTrace::Severity::Info, @@ -225,7 +225,7 @@ TEST_P(ChannelTracerTest, TestNesting) { ValidateChannelTrace(conn1->trace(), 1, GetParam()); ChannelFixture channel3(GetParam()); RefCountedPtr<ChannelNode> sc2 = - MakeRefCounted<ChannelNode>(true, channel3.channel(), GetParam()); + MakeRefCounted<ChannelNode>(channel3.channel(), GetParam()); tracer.AddTraceEventReferencingSubchannel( ChannelTrace::Severity::Info, grpc_slice_from_static_string("subchannel two created"), sc2); diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc index cfd029f8fc..058eea914c 100644 --- a/test/core/channel/channelz_test.cc +++ b/test/core/channel/channelz_test.cc @@ -151,8 +151,7 @@ TEST(ChannelzChannelTest, ChannelzDisabled) { grpc_channel* channel = grpc_insecure_channel_create("fake_target", nullptr, nullptr); ChannelNode* channelz_channel = grpc_channel_get_channelz_node(channel); - char* json_str = channelz_channel->RenderJSON(); - ASSERT_EQ(json_str, nullptr); + ASSERT_EQ(channelz_channel, nullptr); grpc_channel_destroy(channel); } diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index 06343c46b4..847b900af1 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -208,6 +208,7 @@ static void test_channelz(grpc_end2end_test_config config) { grpc_core::channelz::ChannelNode* channelz_channel = grpc_channel_get_channelz_node(f.client); + GPR_ASSERT(channelz_channel); char* json = channelz_channel->RenderJSON(); GPR_ASSERT(json != nullptr); GPR_ASSERT(nullptr != strstr(json, "\"callsStarted\":\"0\"")); @@ -262,6 +263,7 @@ static void test_channelz_with_channel_trace(grpc_end2end_test_config config) { grpc_core::channelz::ChannelNode* channelz_channel = grpc_channel_get_channelz_node(f.client); + GPR_ASSERT(channelz_channel); char* json = channelz_channel->RenderJSON(); GPR_ASSERT(json != nullptr); gpr_log(GPR_INFO, "%s", json); @@ -280,49 +282,10 @@ static void test_channelz_disabled(grpc_end2end_test_config config) { f = begin_test(config, "test_channelz_disabled", nullptr, nullptr); grpc_core::channelz::ChannelNode* channelz_channel = grpc_channel_get_channelz_node(f.client); - char* json_str = channelz_channel->RenderJSON(); - GPR_ASSERT(json_str == nullptr); - grpc_json* json = channelz_channel->trace()->RenderJSON(); - GPR_ASSERT(json == nullptr); + GPR_ASSERT(channelz_channel == nullptr); // one successful request run_one_request(config, f, true); - json_str = channelz_channel->RenderJSON(); - GPR_ASSERT(json_str == nullptr); - GPR_ASSERT(json == nullptr); - end_test(&f); - config.tear_down_data(&f); -} - -static void test_channelz_disabled_with_channel_trace( - grpc_end2end_test_config config) { - grpc_end2end_test_fixture f; - - grpc_arg client_a; - client_a.type = GRPC_ARG_INTEGER; - client_a.key = const_cast<char*>(GRPC_ARG_MAX_CHANNEL_TRACE_EVENTS_PER_NODE); - client_a.value.integer = 5; - grpc_channel_args client_args = {1, &client_a}; - - f = begin_test(config, "test_channelz_disabled_with_channel_trace", - &client_args, nullptr); - grpc_core::channelz::ChannelNode* channelz_channel = - grpc_channel_get_channelz_node(f.client); - // channelz is disabled so rendering return null. - char* json_str = channelz_channel->RenderJSON(); - GPR_ASSERT(json_str == nullptr); - // channel trace is explicitly requested, so this works as it should - grpc_json* json = channelz_channel->trace()->RenderJSON(); - GPR_ASSERT(json != nullptr); - json_str = grpc_json_dump_to_string(json, 0); - GPR_ASSERT(json_str != nullptr); - gpr_log(GPR_INFO, "%s", json_str); - GPR_ASSERT(nullptr != - strstr(json_str, "\"description\":\"Channel created\"")); - GPR_ASSERT(nullptr != strstr(json_str, "\"severity\":\"CT_INFO\"")); - GPR_ASSERT(nullptr != strstr(json_str, "\"numEventsLogged\":")); - grpc_json_destroy(json); - gpr_free(json_str); - + GPR_ASSERT(channelz_channel == nullptr); end_test(&f); config.tear_down_data(&f); } @@ -331,7 +294,6 @@ void channelz(grpc_end2end_test_config config) { test_channelz(config); test_channelz_with_channel_trace(config); test_channelz_disabled(config); - test_channelz_disabled_with_channel_trace(config); } void channelz_pre_init(void) {} |