diff options
author | Vijay Pai <vpai@google.com> | 2018-02-08 11:08:41 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2018-02-08 11:08:41 -0800 |
commit | 239b7d4b0be55975e5fc0b62e28f3d3e2a54fa9b (patch) | |
tree | 30c6d791eed6e7eaa8dfefe29b8b60651e56b059 /test/cpp/interop | |
parent | 8f4fbb1c550c99e25f42ceafec3af92b34279db5 (diff) | |
parent | 100e0a78ebc1ecfaefb57c5105506b3091d4b86c (diff) |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/cpp/interop')
-rw-r--r-- | test/cpp/interop/interop_client.cc | 4 | ||||
-rw-r--r-- | test/cpp/interop/interop_test.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index eab59c72ab..3051afa86b 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -188,7 +188,7 @@ bool InteropClient::PerformLargeUnary(SimpleRequest* request, request->mutable_payload()->set_body(payload.c_str(), kLargeRequestSize); if (request->has_expect_compressed()) { if (request->expect_compressed().value()) { - context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP); + context.set_compression_algorithm(GRPC_COMPRESS_GZIP); } else { context.set_compression_algorithm(GRPC_COMPRESS_NONE); } @@ -496,7 +496,7 @@ bool InteropClient::DoClientCompressedStreaming() { StreamingInputCallRequest request; StreamingInputCallResponse response; - context.set_compression_algorithm(GRPC_COMPRESS_MESSAGE_GZIP); + context.set_compression_algorithm(GRPC_COMPRESS_GZIP); std::unique_ptr<ClientWriter<StreamingInputCallRequest>> stream( serviceStub_.Get()->StreamingInputCall(&context, &response)); diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc index 563b7abb5e..ae155b65f9 100644 --- a/test/cpp/interop/interop_test.cc +++ b/test/cpp/interop/interop_test.cc @@ -31,12 +31,12 @@ #include <gflags/gflags.h> #include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> #include "test/core/util/port.h" #include "test/cpp/util/test_config.h" +#include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/socket_utils_posix.h" |