diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:06:42 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-14 13:06:42 -0700 |
| commit | 813e751d6657abdc167cae28f2998a966e704c3d (patch) | |
| tree | 2b72904deaaad5641752fe9725d226bd28254330 /test/core/end2end | |
| parent | b9f9dcdec00996f844202872515b9ec1940f57fc (diff) | |
| parent | 9b3d39184688cf8fcb159714a1c74608facb15ae (diff) | |
Merge pull request #10660 from ctiller/bugfixes
Bugfixes
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/tests/keepalive_timeout.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/tests/resource_quota_server.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/tests/streaming_error_response.c | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/test/core/end2end/tests/keepalive_timeout.c b/test/core/end2end/tests/keepalive_timeout.c index f274cdb26c..33a409b7bc 100644 --- a/test/core/end2end/tests/keepalive_timeout.c +++ b/test/core/end2end/tests/keepalive_timeout.c @@ -190,8 +190,6 @@ static void test_keepalive_timeout(grpc_end2end_test_config config) { GPR_ASSERT(GRPC_CALL_OK == error); CQ_EXPECT_COMPLETION(cqv, tag(102), 1); - cq_verify(cqv); - CQ_EXPECT_COMPLETION(cqv, tag(1), 1); cq_verify(cqv); diff --git a/test/core/end2end/tests/resource_quota_server.c b/test/core/end2end/tests/resource_quota_server.c index 29b35d0468..b5bc39915a 100644 --- a/test/core/end2end/tests/resource_quota_server.c +++ b/test/core/end2end/tests/resource_quota_server.c @@ -205,7 +205,7 @@ void resource_quota_server(grpc_end2end_test_config config) { op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; op->data.send_initial_metadata.count = 0; - op->flags = 0; + op->flags = GRPC_INITIAL_METADATA_WAIT_FOR_READY; op->reserved = NULL; op++; op->op = GRPC_OP_SEND_MESSAGE; diff --git a/test/core/end2end/tests/streaming_error_response.c b/test/core/end2end/tests/streaming_error_response.c index 0617566c35..0946552271 100644 --- a/test/core/end2end/tests/streaming_error_response.c +++ b/test/core/end2end/tests/streaming_error_response.c @@ -184,6 +184,9 @@ static void test(grpc_end2end_test_config config, bool request_status_early) { GPR_ASSERT(GRPC_CALL_OK == error); CQ_EXPECT_COMPLETION(cqv, tag(102), 1); + if (!request_status_early) { + CQ_EXPECT_COMPLETION(cqv, tag(1), 1); + } cq_verify(cqv); memset(ops, 0, sizeof(ops)); @@ -195,9 +198,6 @@ static void test(grpc_end2end_test_config config, bool request_status_early) { GPR_ASSERT(GRPC_CALL_OK == error); CQ_EXPECT_COMPLETION(cqv, tag(103), 1); - if (!request_status_early) { - CQ_EXPECT_COMPLETION(cqv, tag(1), 1); - } cq_verify(cqv); memset(ops, 0, sizeof(ops)); |