diff options
author | 2015-08-24 15:54:07 -0700 | |
---|---|---|
committer | 2015-08-24 15:54:07 -0700 | |
commit | 3e4bd9598bc8b5740317227c8a7a8e38f519dabe (patch) | |
tree | 6b9399f3fd91ea545bb6cc4ffba3e72eda24303b /test/cpp/end2end/mock_test.cc | |
parent | 9fb35a53320a7b958739ce01ed50de087e6c5ee9 (diff) | |
parent | 8c4549aec780e2cdeb72f028d9a44ad9fd853c33 (diff) |
merge with head
Diffstat (limited to 'test/cpp/end2end/mock_test.cc')
-rw-r--r-- | test/cpp/end2end/mock_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index a547cfc67e..b2c6dc39a8 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -44,7 +44,6 @@ #include <grpc++/server_builder.h> #include <grpc++/server_context.h> #include <grpc++/server_credentials.h> -#include <grpc++/support/dynamic_thread_pool.h> #include <gtest/gtest.h> #include "test/core/util/port.h" @@ -230,7 +229,7 @@ class TestServiceImpl : public TestService::Service { class MockTest : public ::testing::Test { protected: - MockTest() : thread_pool_(2) {} + MockTest() {} void SetUp() GRPC_OVERRIDE { int port = grpc_pick_unused_port_or_die(); @@ -240,7 +239,6 @@ class MockTest : public ::testing::Test { builder.AddListeningPort(server_address_.str(), InsecureServerCredentials()); builder.RegisterService(&service_); - builder.SetThreadPool(&thread_pool_); server_ = builder.BuildAndStart(); } @@ -256,7 +254,6 @@ class MockTest : public ::testing::Test { std::unique_ptr<Server> server_; std::ostringstream server_address_; TestServiceImpl service_; - DynamicThreadPool thread_pool_; }; // Do one real rpc and one mocked one |