From 718ce51af8a24dcf3c02f1f02c9ba7ed1e17c9ee Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 20 May 2016 10:44:23 -0700
Subject: [PATCH] Fix server plugin test
---
test/cpp/end2end/server_builder_plugin_test.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc
index 17fc1afbd8..8a74621e5a 100644
--- a/test/cpp/end2end/server_builder_plugin_test.cc
+++ b/test/cpp/end2end/server_builder_plugin_test.cc
@@ -207,6 +207,12 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
EXPECT_TRUE(plugin != nullptr);
EXPECT_TRUE(plugin->init_server_is_called());
EXPECT_TRUE(plugin->finish_is_called());
+ server_->Shutdown();
+ void* tag;
+ bool ok;
+ cq_->Shutdown();
+ while (cq_->Next(&tag, &ok))
+ ;
}
string to_string(const int number) {
@@ -219,8 +225,8 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
std::shared_ptr<Channel> channel_;
std::unique_ptr<ServerBuilder> builder_;
std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
- std::unique_ptr<Server> server_;
std::unique_ptr<ServerCompletionQueue> cq_;
+ std::unique_ptr<Server> server_;
TestServiceImpl service_;
int port_;
};
--
GitLab