diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-07-27 02:11:55 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-07-27 02:11:55 -0700 |
| commit | 012ddf15efb51e9b592c7cde6d3ba60aa685e818 (patch) | |
| tree | f671b7f4b982913c80accd8da04e6d2ecaa029de /test/core/channel | |
| parent | 1f533d2ae562f6664e707c0390629b40b0fb1957 (diff) | |
| parent | 78aca7bf85fee5eb9c47b430ce20452cec1faf2d (diff) | |
Merge branch 'ref_counted_ptr_polymorphism_fix' of https://github.com/markdroth/grpc into channelz-subchannels
Diffstat (limited to 'test/core/channel')
| -rw-r--r-- | test/core/channel/channel_trace_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc index 3d6aff03eb..efa625bccf 100644 --- a/test/core/channel/channel_trace_test.cc +++ b/test/core/channel/channel_trace_test.cc @@ -187,8 +187,8 @@ TEST_P(ChannelTracerTest, ComplexTest) { AddSimpleTrace(&tracer); AddSimpleTrace(&tracer); AddSimpleTrace(&tracer); - sc1.reset(nullptr); - sc2.reset(nullptr); + sc1.reset(); + sc2.reset(); } // Test a case in which the parent channel has subchannels and the subchannels @@ -234,9 +234,9 @@ TEST_P(ChannelTracerTest, TestNesting) { grpc_slice_from_static_string("subchannel one inactive"), sc1); AddSimpleTrace(&tracer); ValidateChannelTrace(&tracer, 8, GetParam()); - sc1.reset(nullptr); - sc2.reset(nullptr); - conn1.reset(nullptr); + sc1.reset(); + sc2.reset(); + conn1.reset(); } INSTANTIATE_TEST_CASE_P(ChannelTracerTestSweep, ChannelTracerTest, |