diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-06 07:56:05 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-06 07:56:05 -0700 |
| commit | 4bcdd73df6162ccadc9d54d3df6956bd378475f0 (patch) | |
| tree | 60eb936a76b57f383724b04ee20366f03478cfde /test/cpp/end2end | |
| parent | eb7574b39b2d3c1d3f077bdebe7e548eca283d6e (diff) | |
| parent | 3a9f49d409d5fa552ea6053eedfa0a8e27d160e0 (diff) | |
Merge remote-tracking branch 'upstream/master' into fail_fast
Diffstat (limited to 'test/cpp/end2end')
| -rw-r--r-- | test/cpp/end2end/proto_server_reflection_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc index efbb0e1f8e..75efd01f06 100644 --- a/test/cpp/end2end/proto_server_reflection_test.cc +++ b/test/cpp/end2end/proto_server_reflection_test.cc @@ -144,7 +144,7 @@ class ProtoServerReflectionTest : public ::testing::Test { TEST_F(ProtoServerReflectionTest, CheckResponseWithLocalDescriptorPool) { ResetStub(); - std::vector<std::string> services; + std::vector<grpc::string> services; desc_db_->GetServices(&services); // The service list has at least one service (reflection servcie). EXPECT_TRUE(services.size() > 0); |