diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
| commit | b1f24078338108a0b741a342e4916731f01b2601 (patch) | |
| tree | 80e054b92d5a2100d2af79a324b6c73a8dd765e8 /test/cpp/util/cli_call_test.cc | |
| parent | d392fa04c5866387c981f4cd83392d1a2e3da7a8 (diff) | |
| parent | e29e18ccf07be20da2540b8fc862894ff933aa6c (diff) | |
merge with head and resolve conflicts
Diffstat (limited to 'test/cpp/util/cli_call_test.cc')
| -rw-r--r-- | test/cpp/util/cli_call_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 146e96720f..a48a56ae90 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -39,7 +39,6 @@ #include <grpc++/client_context.h> #include <grpc++/create_channel.h> #include <grpc++/credentials.h> -#include <grpc++/dynamic_thread_pool.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> @@ -75,7 +74,7 @@ class TestServiceImpl : public ::grpc::cpp::test::util::TestService::Service { class CliCallTest : public ::testing::Test { protected: - CliCallTest() : thread_pool_(2) {} + CliCallTest() {} void SetUp() GRPC_OVERRIDE { int port = grpc_pick_unused_port_or_die(); @@ -85,7 +84,6 @@ class CliCallTest : public ::testing::Test { builder.AddListeningPort(server_address_.str(), InsecureServerCredentials()); builder.RegisterService(&service_); - builder.SetThreadPool(&thread_pool_); server_ = builder.BuildAndStart(); } @@ -102,7 +100,6 @@ class CliCallTest : public ::testing::Test { std::unique_ptr<Server> server_; std::ostringstream server_address_; TestServiceImpl service_; - DynamicThreadPool thread_pool_; }; // Send a rpc with a normal stub and then a CliCall. Verify they match. |