Fix streaming_error_response test (failing in epoll1 but bug is not related to epoll1)

pull/11936/head
Sree Kuchibhotla 7 years ago
parent b414268580
commit fc58bd827e
  1. 25
      test/core/end2end/tests/streaming_error_response.c
  2. 4
      tools/run_tests/run_tests.py

@ -185,6 +185,19 @@ static void test(grpc_end2end_test_config config, bool request_status_early) {
CQ_EXPECT_COMPLETION(cqv, tag(103), 1); CQ_EXPECT_COMPLETION(cqv, tag(103), 1);
cq_verify(cqv); 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)); memset(ops, 0, sizeof(ops));
op = ops; op = ops;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER; 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); error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(104), NULL);
GPR_ASSERT(GRPC_CALL_OK == error); 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); CQ_EXPECT_COMPLETION(cqv, tag(104), 1);
if (request_status_early) { if (request_status_early) {
CQ_EXPECT_COMPLETION(cqv, tag(1), 1); CQ_EXPECT_COMPLETION(cqv, tag(1), 1);
} else {
CQ_EXPECT_COMPLETION(cqv, tag(2), 1);
} }
cq_verify(cqv); cq_verify(cqv);

@ -63,8 +63,8 @@ _FORCE_ENVIRON_FOR_WRAPPERS = {
} }
_POLLING_STRATEGIES = { _POLLING_STRATEGIES = {
'linux': ['epollsig', 'poll', 'poll-cv'], 'linux': ['epollsig', 'epoll1', 'poll', 'poll-cv'],
# TODO(ctiller, sreecha): enable epoll1, epollex, epoll-thread-pool # TODO(ctiller, sreecha): enable epollex, epoll-thread-pool
'mac': ['poll'], 'mac': ['poll'],
} }

Loading…
Cancel
Save