diff options
author | Julien Boeuf <jboeuf@google.com> | 2015-08-28 14:33:17 -0700 |
---|---|---|
committer | Julien Boeuf <jboeuf@google.com> | 2015-08-28 14:33:17 -0700 |
commit | 6c7185d350ef040fc3a2c0970de9268fd936504a (patch) | |
tree | b0c7144667ef735f97997c3e9be2f22285ea653d /test/cpp/end2end/async_end2end_test.cc | |
parent | a1ad051d0ae30cf800c9bc27d3e7e35f0ccce55f (diff) | |
parent | 808e5ae95f2fba44d2da925e8da0eaa5ce5c6585 (diff) |
Merge branch 'master' of github.com:grpc/grpc into credentials_naming_and_cleanup
Diffstat (limited to 'test/cpp/end2end/async_end2end_test.cc')
-rw-r--r-- | test/cpp/end2end/async_end2end_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 41b91e459b..bbcac9ba34 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -200,8 +200,8 @@ class AsyncEnd2endTest : public ::testing::TestWithParam<bool> { } void ResetStub() { - std::shared_ptr<Channel> channel = CreateChannel( - server_address_.str(), InsecureCredentials(), ChannelArguments()); + std::shared_ptr<Channel> channel = + CreateChannel(server_address_.str(), InsecureCredentials()); stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel)); } @@ -750,8 +750,8 @@ TEST_P(AsyncEnd2endTest, ServerCheckDone) { } TEST_P(AsyncEnd2endTest, UnimplementedRpc) { - std::shared_ptr<Channel> channel = CreateChannel( - server_address_.str(), InsecureCredentials(), ChannelArguments()); + std::shared_ptr<Channel> channel = + CreateChannel(server_address_.str(), InsecureCredentials()); std::unique_ptr<grpc::cpp::test::util::UnimplementedService::Stub> stub; stub = std::move(grpc::cpp::test::util::UnimplementedService::NewStub(channel)); |