diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-08-21 15:19:50 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-08-21 15:19:50 -0700 |
| commit | 7c62a35c6fcf9f1e3d66a012c7c4a14b30367052 (patch) | |
| tree | f9ef540ee26eee93b620486b85b9d3e57993cbed /test/core/end2end | |
| parent | 219d9f52de57d701c1113f58bd2745a1d3107771 (diff) | |
| parent | d6cf6dea3677c753e27999d0f2f9695da78932f2 (diff) | |
Merge remote-tracking branch 'upstream/master' into stream_compression_config
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/tests/streaming_error_response.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/test/core/end2end/tests/streaming_error_response.c b/test/core/end2end/tests/streaming_error_response.c index fd8fa7ff6c..9d562b9090 100644 --- a/test/core/end2end/tests/streaming_error_response.c +++ b/test/core/end2end/tests/streaming_error_response.c @@ -185,6 +185,19 @@ static void test(grpc_end2end_test_config config, bool request_status_early) { CQ_EXPECT_COMPLETION(cqv, tag(103), 1); cq_verify(cqv); + if (!request_status_early) { + memset(ops, 0, sizeof(ops)); + op = ops; + op->op = GRPC_OP_RECV_MESSAGE; + op->data.recv_message.recv_message = &response_payload2_recv; + op++; + error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(2), NULL); + GPR_ASSERT(GRPC_CALL_OK == error); + + CQ_EXPECT_COMPLETION(cqv, tag(2), 1); + cq_verify(cqv); + } + memset(ops, 0, sizeof(ops)); op = ops; op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; @@ -199,21 +212,9 @@ static void test(grpc_end2end_test_config config, bool request_status_early) { error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(104), NULL); GPR_ASSERT(GRPC_CALL_OK == error); - if (!request_status_early) { - memset(ops, 0, sizeof(ops)); - op = ops; - op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message.recv_message = &response_payload2_recv; - op++; - error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(2), NULL); - GPR_ASSERT(GRPC_CALL_OK == error); - } - CQ_EXPECT_COMPLETION(cqv, tag(104), 1); if (request_status_early) { CQ_EXPECT_COMPLETION(cqv, tag(1), 1); - } else { - CQ_EXPECT_COMPLETION(cqv, tag(2), 1); } cq_verify(cqv); |