diff options
| author |  Noah Eisen <ncteisen@google.com> | 2016-10-27 20:44:50 -0700 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2016-10-27 20:44:50 -0700 |
| commit | c02bd2d31d7953c30cdbf9504e56bac7f6f09d3d (patch) | |
| tree | f3bbf36037fab3d04401a2b10848df2cf7d127ae /test/cpp | |
| parent | 7fc1d4e8d7c66b506e4b9e39ebac4dfd6001b4c1 (diff) | |
| parent | 51fc01dffabf778f8dc4697db4bc33461a29683b (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into cpp_unimplemented_service
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/end2end/async_end2end_test.cc | 5 | ||||
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index a9b7c8f8d3..823f0bd035 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -47,6 +47,7 @@ #include <grpc/support/tls.h> #include <gtest/gtest.h> +#include "src/core/lib/iomgr/port.h" #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" @@ -54,7 +55,7 @@ #include "test/cpp/util/string_ref_helper.h" #include "test/cpp/util/test_credentials_provider.h" -#ifdef GPR_POSIX_SOCKET +#ifdef GRPC_POSIX_SOCKET #include "src/core/lib/iomgr/ev_posix.h" #endif @@ -73,7 +74,7 @@ namespace { void* tag(int i) { return (void*)(intptr_t)i; } int detag(void* p) { return static_cast<int>(reinterpret_cast<intptr_t>(p)); } -#ifdef GPR_POSIX_SOCKET +#ifdef GRPC_POSIX_SOCKET static int maybe_assert_non_blocking_poll(struct pollfd* pfds, nfds_t nfds, int timeout) { if (gpr_tls_get(&g_is_async_end2end_test)) { diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index b1d3ce92f6..7af0fb997e 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -636,7 +636,7 @@ TEST_P(End2endTest, SimpleRpcWithCustomeUserAgentPrefix) { auto iter = trailing_metadata.find("user-agent"); EXPECT_TRUE(iter != trailing_metadata.end()); grpc::string expected_prefix = user_agent_prefix_ + " grpc-c++/"; - EXPECT_TRUE(iter->second.starts_with(expected_prefix)); + EXPECT_TRUE(iter->second.starts_with(expected_prefix)) << iter->second; } TEST_P(End2endTest, MultipleRpcsWithVariedBinaryMetadataValue) { |