diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-13 15:01:03 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-13 15:01:03 -0700 |
| commit | 80dc66d8aba7d04a3b0cab2054c3227dbd3e7c9a (patch) | |
| tree | 753d1b7402f9d958bcd979022904ca49ac147a67 /test/cpp/interop | |
| parent | 1665059f632c0b753e5551eac374d790546e4dbc (diff) | |
| parent | ed48bf8f71efce4a9037a74ae9ab2c83a3e9b4a7 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'test/cpp/interop')
| -rw-r--r-- | test/cpp/interop/interop_client.cc | 3 | ||||
| -rw-r--r-- | test/cpp/interop/server.cc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index bc5b7adb1c..cb6a607167 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -445,7 +445,6 @@ void InteropClient::DoHalfDuplex() { unsigned int i = 0; StreamingOutputCallResponse response; while (stream->Read(&response)) { - GPR_ASSERT(response.payload().has_body()); GPR_ASSERT(response.payload().body() == grpc::string(response_stream_sizes[i], '\0')); ++i; @@ -475,7 +474,6 @@ void InteropClient::DoPingPong() { payload->set_body(grpc::string(request_stream_sizes[i], '\0')); GPR_ASSERT(stream->Write(request)); GPR_ASSERT(stream->Read(&response)); - GPR_ASSERT(response.payload().has_body()); GPR_ASSERT(response.payload().body() == grpc::string(response_stream_sizes[i], '\0')); } @@ -522,7 +520,6 @@ void InteropClient::DoCancelAfterFirstResponse() { StreamingOutputCallResponse response; GPR_ASSERT(stream->Write(request)); GPR_ASSERT(stream->Read(&response)); - GPR_ASSERT(response.payload().has_body()); GPR_ASSERT(response.payload().body() == grpc::string(31415, '\0')); gpr_log(GPR_INFO, "Trying to cancel..."); context.TryCancel(); diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc index 2ea8794e5a..319e394399 100644 --- a/test/cpp/interop/server.cc +++ b/test/cpp/interop/server.cc @@ -184,7 +184,7 @@ class TestServiceImpl : public TestService::Service { StreamingInputCallRequest request; int aggregated_payload_size = 0; while (reader->Read(&request)) { - if (request.has_payload() && request.payload().has_body()) { + if (request.has_payload()) { aggregated_payload_size += request.payload().body().size(); } } |