aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-10-03 15:00:04 -0700
committerGravatar ncteisen <ncteisen@gmail.com>2018-10-03 15:09:10 -0700
commit8362e7042d4c7d41c756d85b4e64d499ae4e52ed (patch)
tree66856dc51c723d07b9e5474982805695c09d723c /test
parent3545d754d53448ce4ce17ac9605d4765094aa739 (diff)
Undo adding new API to tranport
Diffstat (limited to 'test')
-rw-r--r--test/core/end2end/tests/channelz.cc6
-rw-r--r--test/cpp/microbenchmarks/bm_call_create.cc10
2 files changed, 8 insertions, 8 deletions
diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc
index 678163e1f2..2711d87f17 100644
--- a/test/core/end2end/tests/channelz.cc
+++ b/test/core/end2end/tests/channelz.cc
@@ -252,14 +252,16 @@ static void test_channelz(grpc_end2end_test_config config) {
GPR_ASSERT(nullptr != strstr(json, "\"callsStarted\":\"2\""));
GPR_ASSERT(nullptr != strstr(json, "\"callsFailed\":\"1\""));
GPR_ASSERT(nullptr != strstr(json, "\"callsSucceeded\":\"1\""));
- GPR_ASSERT(nullptr != strstr(json, "\"listenSocket\""));
- GPR_ASSERT(nullptr != strstr(json, "\"socketId\""));
// channel tracing is not enabled, so these should not be preset.
GPR_ASSERT(nullptr == strstr(json, "\"trace\""));
GPR_ASSERT(nullptr == strstr(json, "\"description\":\"Channel created\""));
GPR_ASSERT(nullptr == strstr(json, "\"severity\":\"CT_INFO\""));
gpr_free(json);
+ json = channelz_server->RenderServerSockets(0);
+ GPR_ASSERT(nullptr != strstr(json, "\"socketRef\":"));
+ gpr_free(json);
+
end_test(&f);
config.tear_down_data(&f);
}
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index f9b5f21c34..9516b2e3e2 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -446,13 +446,11 @@ void Destroy(grpc_transport* self) {}
/* implementation of grpc_transport_get_endpoint */
grpc_endpoint* GetEndpoint(grpc_transport* self) { return nullptr; }
-static intptr_t GetSocketUuid(grpc_transport* t) { return 0; }
-
static const grpc_transport_vtable dummy_transport_vtable = {
- 0, "dummy_http2", InitStream,
- SetPollset, SetPollsetSet, PerformStreamOp,
- PerformOp, DestroyStream, Destroy,
- GetEndpoint, GetSocketUuid};
+ 0, "dummy_http2", InitStream,
+ SetPollset, SetPollsetSet, PerformStreamOp,
+ PerformOp, DestroyStream, Destroy,
+ GetEndpoint};
static grpc_transport dummy_transport = {&dummy_transport_vtable};