diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-05-09 08:35:42 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-05-09 08:35:42 +0200 |
| commit | 18938cd4723d4dae79dd320f0434459bc481570a (patch) | |
| tree | 1bc2851c564fcb1f9d213b6b9035263174d292ca /test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c | |
| parent | 2e3639302adf75c1ca0c93ada2ab875c8a9d3f37 (diff) | |
| parent | cc193a66661eea897a53d16b0cd4054a338f9c9b (diff) | |
Merge branch 'master' of github.com:grpc/grpc into generate-test-projects
Conflicts:
Makefile
test/core/end2end/gen_build_json.py
tools/run_tests/tests.json
vsprojects/Grpc.mak
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 02dd7563d7..04306df074 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 @@ -183,7 +183,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; @@ -200,7 +200,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")); |