diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 16:38:32 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-08 16:38:32 -0700 |
| commit | 0b488f7649065ad6f00cabbbb617a05dfc7a92e3 (patch) | |
| tree | 7a9381245a9913b6123910a531a0d1a20a463a14 /test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c | |
| parent | 2be6095c10353fbcdfbdec50e269775c1a42641d (diff) | |
| parent | b8b59b18f2585b602a8c4282ebaf4d5c8bef473a (diff) | |
Merge github.com:grpc/grpc into churn-churn-churn-the-api-gently-down-the-stream
Conflicts:
test/cpp/end2end/async_end2end_test.cc
Diffstat (limited to 'test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c')
| -rw-r--r-- | test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c index b4b377b606..3627a43408 100644 --- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c +++ b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c @@ -185,7 +185,7 @@ static void test_request_response_with_metadata_and_payload( op->op = GRPC_OP_SEND_STATUS_FROM_SERVER; op->data.send_status_from_server.trailing_metadata_count = 2; op->data.send_status_from_server.trailing_metadata = meta_t; - op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED; + op->data.send_status_from_server.status = GRPC_STATUS_OK; op->data.send_status_from_server.status_details = "xyz"; op++; op->op = GRPC_OP_RECV_MESSAGE; @@ -202,7 +202,7 @@ static void test_request_response_with_metadata_and_payload( cq_expect_completion(v_client, tag(1), GRPC_OP_OK); cq_verify(v_client); - GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED); + GPR_ASSERT(status == GRPC_STATUS_OK); GPR_ASSERT(0 == strcmp(details, "xyz")); GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); |