diff options
author | 2015-01-13 12:39:00 -0800 | |
---|---|---|
committer | 2015-01-13 12:39:00 -0800 | |
commit | 1ee7cb0c0be1413f794c0e15003c2068016fb965 (patch) | |
tree | 598212e9a1df13f9161d4fe20ee5118c0adfa6fb /test/cpp/end2end/end2end_test.cc | |
parent | 74768d3103107db02e3336c89ab5851e06fc8cf8 (diff) | |
parent | 52d4389009dedec185a8c07670d043b2e173f8d9 (diff) |
Merge github.com:google/grpc into format
Diffstat (limited to 'test/cpp/end2end/end2end_test.cc')
-rw-r--r-- | test/cpp/end2end/end2end_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 1c82e37c1d..e01a6efe82 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -34,7 +34,7 @@ #include <chrono> #include <thread> -#include "net/grpc/cpp/echo_duplicate_proto_cc.pb.h" +#include "test/cpp/util/echo_duplicate.pb.h" #include "test/cpp/util/echo.pb.h" #include "src/cpp/util/time.h" #include <grpc++/channel_arguments.h> @@ -47,7 +47,7 @@ #include <grpc++/server_context.h> #include <grpc++/status.h> #include <grpc++/stream.h> -#include "net/util/netutil.h" +#include "test/core/util/port.h" #include <gtest/gtest.h> #include <grpc/grpc.h> @@ -141,7 +141,7 @@ class TestServiceImplDupPkg class End2endTest : public ::testing::Test { protected: void SetUp() override { - int port = PickUnusedPortOrDie(); + int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; // Setup server ServerBuilder builder; @@ -187,7 +187,7 @@ TEST_F(End2endTest, SimpleRpc) { TEST_F(End2endTest, MultipleRpcs) { ResetStub(); - vector<std::thread*> threads; + std::vector<std::thread*> threads; for (int i = 0; i < 10; ++i) { threads.push_back(new std::thread(SendRpc, stub_.get(), 10)); } |