diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-09-02 09:29:43 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-09-02 09:29:43 -0700 |
| commit | 56f21aa79c794cad614bec30702e6c5ff3922518 (patch) | |
| tree | 33d3f999d8d48813d6287e7411037ed0e6039fa2 /test/core/end2end/tests/trailing_metadata.c | |
| parent | aef3a79ae4cfa7236673407e09aff001a8d2e02f (diff) | |
| parent | f6b6d2984157cc24ee69afb9b025b5d250a5a9ad (diff) | |
Merge branch 'grand-unified-closures' into who-combines-the-combiners
Diffstat (limited to 'test/core/end2end/tests/trailing_metadata.c')
| -rw-r--r-- | test/core/end2end/tests/trailing_metadata.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/core/end2end/tests/trailing_metadata.c b/test/core/end2end/tests/trailing_metadata.c index 41e0f00911..d7093ae723 100644 --- a/test/core/end2end/tests/trailing_metadata.c +++ b/test/core/end2end/tests/trailing_metadata.c @@ -43,8 +43,6 @@ #include <grpc/support/useful.h> #include "test/core/end2end/cq_verifier.h" -enum { TIMEOUT = 200000 }; - static void *tag(intptr_t t) { return (void *)t; } static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, @@ -186,7 +184,7 @@ static void test_request_response_with_metadata_and_payload( grpc_server_request_call(f.server, &s, &call_details, &request_metadata_recv, f.cq, f.cq, tag(101)); GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(101), 1); + CQ_EXPECT_COMPLETION(cqv, tag(101), 1); cq_verify(cqv); memset(ops, 0, sizeof(ops)); @@ -205,7 +203,7 @@ static void test_request_response_with_metadata_and_payload( error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL); GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(102), 1); + CQ_EXPECT_COMPLETION(cqv, tag(102), 1); cq_verify(cqv); memset(ops, 0, sizeof(ops)); @@ -231,8 +229,8 @@ static void test_request_response_with_metadata_and_payload( error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL); GPR_ASSERT(GRPC_CALL_OK == error); - cq_expect_completion(cqv, tag(103), 1); - cq_expect_completion(cqv, tag(1), 1); + CQ_EXPECT_COMPLETION(cqv, tag(103), 1); + CQ_EXPECT_COMPLETION(cqv, tag(1), 1); cq_verify(cqv); GPR_ASSERT(status == GRPC_STATUS_OK); |