diff options
| author |  David Klempner <klempner@google.com> | 2015-02-26 09:29:24 -0800 |
|---|---|---|
| committer | David Klempner <klempner@google.com> | 2015-02-26 09:29:24 -0800 |
| commit | c33731aea655720293576e77ec4d5f04e1f7d545 (patch) | |
| tree | fbac668b6a81b3cf3dd91778f9b84b5e5cbcaa7c /test | |
| parent | b7926e05515c42c8804942537452db1f2c137c9d (diff) | |
| parent | e2d795a27bfcd01e627d0fc5523ad138ddb4eda6 (diff) | |
Merge pull request #822 from ctiller/hard
Fix max_concurrent_streams test
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/end2end/tests/max_concurrent_streams.c | 4 | ||||
| -rw-r--r-- | test/core/end2end/tests/max_concurrent_streams_legacy.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/tests/max_concurrent_streams.c b/test/core/end2end/tests/max_concurrent_streams.c index 743048881d..3a2f2b3655 100644 --- a/test/core/end2end/tests/max_concurrent_streams.c +++ b/test/core/end2end/tests/max_concurrent_streams.c @@ -196,7 +196,7 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { GPR_ASSERT(GRPC_CALL_OK == grpc_call_invoke_old(c2, f.client_cq, tag(401), tag(402), 0)); GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c1, tag(303))); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c2, tag(303))); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c2, tag(403))); ev = grpc_completion_queue_next( f.client_cq, gpr_time_add(gpr_now(), gpr_time_from_seconds(10))); @@ -230,8 +230,8 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { /* first request is finished, we should be able to start the second */ cq_expect_finished_with_status(v_client, tag(live_call + 2), GRPC_STATUS_UNIMPLEMENTED, "xyz", NULL); - cq_expect_finish_accepted(v_client, tag(live_call + 3), GRPC_OP_OK); live_call = (live_call == 300) ? 400 : 300; + cq_expect_finish_accepted(v_client, tag(live_call + 3), GRPC_OP_OK); cq_verify(v_client); GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(200))); diff --git a/test/core/end2end/tests/max_concurrent_streams_legacy.c b/test/core/end2end/tests/max_concurrent_streams_legacy.c index 8bf1154387..0d55286de9 100644 --- a/test/core/end2end/tests/max_concurrent_streams_legacy.c +++ b/test/core/end2end/tests/max_concurrent_streams_legacy.c @@ -196,7 +196,7 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { GPR_ASSERT(GRPC_CALL_OK == grpc_call_invoke_old(c2, f.client_cq, tag(401), tag(402), 0)); GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c1, tag(303))); - GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c2, tag(303))); + GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c2, tag(403))); ev = grpc_completion_queue_next( f.client_cq, gpr_time_add(gpr_now(), gpr_time_from_seconds(10))); @@ -230,8 +230,8 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { /* first request is finished, we should be able to start the second */ cq_expect_finished_with_status(v_client, tag(live_call + 2), GRPC_STATUS_UNIMPLEMENTED, "xyz", NULL); - cq_expect_finish_accepted(v_client, tag(live_call + 3), GRPC_OP_OK); live_call = (live_call == 300) ? 400 : 300; + cq_expect_finish_accepted(v_client, tag(live_call + 3), GRPC_OP_OK); cq_verify(v_client); GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(200))); |