Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert some tests to new API

Browse Source
pull/1397/head
Craig Tiller 10 years ago
parent af20b7108b
commit 8b1d98998b
9 changed files with 519 additions and 206 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      test/core/end2end/tests/cancel_after_accept.c
  2. 110
      test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
  3. 94
      test/core/end2end/tests/census_simple_request.c
  4. 95
      test/core/end2end/tests/disappearing_server.c
  5. 81
      test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
  6. 13
      test/core/end2end/tests/early_server_shutdown_finishes_tags.c
  7. 97
      test/core/end2end/tests/graceful_server_shutdown.c
  8. 137
      test/core/end2end/tests/invoke_large_request.c
  9. 93
      test/core/end2end/tests/max_concurrent_streams.c

5
test/core/end2end/tests/cancel_after_accept.c
Unescape View File

@ -153,8 +153,6 @@ static void test_cancel_after_accept(grpc_end2end_test_config config,
op->op = GRPC_OP_SEND_MESSAGE; op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message = request_payload; op->data.send_message = request_payload;
op++; op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA; op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv; op->data.recv_initial_metadata = &initial_metadata_recv;
op++; op++;
@ -173,9 +171,6 @@ static void test_cancel_after_accept(grpc_end2end_test_config config,
op->op = GRPC_OP_RECV_MESSAGE; op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message = &request_payload_recv; op->data.recv_message = &request_payload_recv;
op++; op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
op->op = GRPC_OP_SEND_INITIAL_METADATA; op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0; op->data.send_initial_metadata.count = 0;
op++; op++;

110
test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
Unescape View File

@ -106,48 +106,106 @@ static void end_test(grpc_end2end_test_fixture *f) {
/* Cancel after accept with a writes closed, no payload */ /* Cancel after accept with a writes closed, no payload */
static void test_cancel_after_accept_and_writes_closed( static void test_cancel_after_accept_and_writes_closed(
grpc_end2end_test_config config, cancellation_mode mode) { grpc_end2end_test_config config, cancellation_mode mode) {
grpc_op ops[6];
grpc_op *op;
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL); grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
gpr_timespec deadline = five_seconds_time(); gpr_timespec deadline = five_seconds_time();
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_metadata_array initial_metadata_recv;
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_metadata_array trailing_metadata_recv;
deadline); grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
grpc_byte_buffer *request_payload_recv = NULL;
grpc_byte_buffer *response_payload_recv = NULL;
gpr_slice request_payload_slice = gpr_slice_from_copied_string("hello world");
gpr_slice response_payload_slice = gpr_slice_from_copied_string("hello you");
grpc_byte_buffer *request_payload =
grpc_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer *response_payload =
grpc_byte_buffer_create(&response_payload_slice, 1);
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); grpc_call_details_init(&call_details);
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr",
deadline, NULL); op = ops;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message = request_payload;
op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message = &response_payload_recv;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(
f.server, &s, &call_details,
&request_metadata_recv, f.server_cq, tag(2)));
cq_expect_completion(v_server, tag(2), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == op = ops;
grpc_call_server_accept_old(s, f.server_cq, tag(102))); op->op = GRPC_OP_RECV_MESSAGE;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0)); op->data.recv_message = &request_payload_recv;
cq_expect_client_metadata_read(v_client, tag(2), NULL); op++;
cq_verify(v_client); op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message = response_payload;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(3)));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c));
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
cq_verify(v_client);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read_old(s, tag(101))); cq_expect_completion(v_server, tag(3), GRPC_OP_OK);
cq_expect_empty_read(v_server, tag(101));
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c)); cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
cq_expect_finished_with_status(v_client, tag(3), mode.expect_status,
mode.expect_details, NULL);
cq_verify(v_client); cq_verify(v_client);
cq_expect_finished_with_status(v_server, tag(102), GRPC_STATUS_CANCELLED, GPR_ASSERT(status == mode.expect_status);
NULL, NULL); GPR_ASSERT(0 == strcmp(details, mode.expect_details));
cq_verify(v_server); GPR_ASSERT(was_cancelled == 1);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_byte_buffer_destroy(request_payload);
grpc_byte_buffer_destroy(response_payload);
grpc_byte_buffer_destroy(request_payload_recv);
grpc_byte_buffer_destroy(response_payload_recv);
gpr_free(details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s); grpc_call_destroy(s);

94
test/core/end2end/tests/census_simple_request.c
Unescape View File

@ -102,41 +102,85 @@ static void *tag(gpr_intptr t) { return (void *)t; }
static void test_body(grpc_end2end_test_fixture f) { static void test_body(grpc_end2end_test_fixture f) {
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
gpr_timespec deadline = n_seconds_time(10); gpr_timespec deadline = n_seconds_time(5);
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_op ops[6];
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_op *op;
deadline); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr:1234", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
tag(1);
GPR_ASSERT(GRPC_CALL_OK ==
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); grpc_metadata_array_init(&initial_metadata_recv);
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK); grpc_metadata_array_init(&trailing_metadata_recv);
cq_verify(v_client); grpc_metadata_array_init(&request_metadata_recv);
grpc_call_details_init(&call_details);
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); op = ops;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op->op = GRPC_OP_SEND_INITIAL_METADATA;
deadline, NULL); op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
op->data.send_status_from_server.status_details = "xyz";
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
grpc_call_server_accept_old(s, f.server_cq, tag(102)));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0));
cq_expect_client_metadata_read(v_client, tag(2), NULL);
cq_verify(v_client); cq_verify(v_client);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status_old( GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
s, GRPC_STATUS_UNIMPLEMENTED, "xyz", tag(5))); GPR_ASSERT(0 == strcmp(details, "xyz"));
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED, GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
"xyz", NULL); GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234"));
cq_verify(v_client); GPR_ASSERT(was_cancelled == 0);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
cq_expect_finish_accepted(v_server, tag(5), GRPC_OP_OK);
cq_expect_finished(v_server, tag(102), NULL);
cq_verify(v_server);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s); grpc_call_destroy(s);

95
test/core/end2end/tests/disappearing_server.c
Unescape View File

@ -96,42 +96,85 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f,
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
gpr_timespec deadline = five_seconds_time(); gpr_timespec deadline = five_seconds_time();
grpc_op ops[6];
c = grpc_channel_create_call_old(f->client, "/foo", "foo.test.google.fr", grpc_op *op;
deadline); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f->client, f->client_cq, "/foo",
"foo.test.google.fr:1234", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f->client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); grpc_call_details_init(&call_details);
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
cq_verify(v_client); op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f->server, tag(100))); op->data.send_initial_metadata.count = 0;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op++;
deadline, NULL); op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f->server, &s,
&call_details,
&request_metadata_recv,
f->server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK ==
grpc_call_server_accept_old(s, f->server_cq, tag(102)));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0));
cq_expect_client_metadata_read(v_client, tag(2), NULL);
cq_verify(v_client);
/* should be able to shut down the server early /* should be able to shut down the server early
- and still complete the request */ - and still complete the request */
grpc_server_shutdown(f->server); grpc_server_shutdown(f->server);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status_old( op = ops;
s, GRPC_STATUS_UNIMPLEMENTED, "xyz", tag(5))); op->op = GRPC_OP_SEND_INITIAL_METADATA;
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED, op->data.send_initial_metadata.count = 0;
"xyz", NULL); op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
op->data.send_status_from_server.status_details = "xyz";
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server);
cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
cq_verify(v_client); cq_verify(v_client);
cq_expect_finish_accepted(v_server, tag(5), GRPC_OP_OK); GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
cq_expect_finished(v_server, tag(102), NULL); GPR_ASSERT(0 == strcmp(details, "xyz"));
cq_verify(v_server); GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234"));
GPR_ASSERT(was_cancelled == 0);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s); grpc_call_destroy(s);

81
test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
Unescape View File

@ -104,48 +104,79 @@ static void end_test(grpc_end2end_test_fixture *f) {
static void test_early_server_shutdown_finishes_inflight_calls( static void test_early_server_shutdown_finishes_inflight_calls(
grpc_end2end_test_config config) { grpc_end2end_test_config config) {
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
gpr_timespec deadline = five_seconds_time(); gpr_timespec deadline = five_seconds_time();
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_op ops[6];
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_op *op;
deadline); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); grpc_call_details_init(&call_details);
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
cq_verify(v_client); op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); op->data.send_initial_metadata.count = 0;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op->data.send_initial_metadata.metadata = NULL;
deadline, NULL); op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK ==
grpc_call_server_accept_old(s, f.server_cq, tag(102)));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0));
cq_expect_client_metadata_read(v_client, tag(2), NULL);
cq_verify(v_client);
/* shutdown and destroy the server */ /* shutdown and destroy the server */
shutdown_server(&f); shutdown_server(&f);
cq_expect_finished(v_server, tag(102), NULL); cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
grpc_call_destroy(s); cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNAVAILABLE,
NULL, NULL);
cq_verify(v_client); cq_verify(v_client);
GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE);
GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr"));
GPR_ASSERT(was_cancelled == 1);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s);
cq_verifier_destroy(v_client); cq_verifier_destroy(v_client);
cq_verifier_destroy(v_server); cq_verifier_destroy(v_server);

13
test/core/end2end/tests/early_server_shutdown_finishes_tags.c
Unescape View File

@ -107,13 +107,20 @@ static void test_early_server_shutdown_finishes_tags(
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL); grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_call *s = (void *)1; grpc_call *s = (void *)1;
grpc_call_details call_details;
grpc_metadata_array request_metadata_recv;
grpc_metadata_array_init(&request_metadata_recv);
grpc_call_details_init(&call_details);
/* upon shutdown, the server should finish all requested calls indicating /* upon shutdown, the server should finish all requested calls indicating
no new call */ no new call */
grpc_server_request_call_old(f.server, tag(1000)); GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
grpc_server_shutdown(f.server); grpc_server_shutdown(f.server);
cq_expect_server_rpc_new(v_server, &s, tag(1000), NULL, NULL, gpr_inf_past, cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
NULL);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(s == NULL); GPR_ASSERT(s == NULL);

97
test/core/end2end/tests/graceful_server_shutdown.c
Unescape View File

@ -103,50 +103,95 @@ static void end_test(grpc_end2end_test_fixture *f) {
static void test_early_server_shutdown_finishes_inflight_calls( static void test_early_server_shutdown_finishes_inflight_calls(
grpc_end2end_test_config config) { grpc_end2end_test_config config) {
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
gpr_timespec deadline = five_seconds_time(); gpr_timespec deadline = five_seconds_time();
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_op ops[6];
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_op *op;
deadline); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); grpc_call_details_init(&call_details);
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
cq_verify(v_client); op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); op->data.send_initial_metadata.count = 0;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op->data.send_initial_metadata.metadata = NULL;
deadline, NULL); op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == /* shutdown and destroy the server */
grpc_call_server_accept_old(s, f.server_cq, tag(102)));
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0));
cq_expect_client_metadata_read(v_client, tag(2), NULL);
cq_verify(v_client);
/* shutdown the server */
grpc_server_shutdown_and_notify(f.server, tag(0xdead)); grpc_server_shutdown_and_notify(f.server, tag(0xdead));
cq_verify_empty(v_server); cq_verify_empty(v_server);
grpc_call_start_write_status_old(s, GRPC_STATUS_OK, NULL, tag(103)); op = ops;
grpc_call_destroy(s); op->op = GRPC_OP_SEND_INITIAL_METADATA;
cq_expect_finish_accepted(v_server, tag(103), GRPC_OP_OK); op->data.send_initial_metadata.count = 0;
cq_expect_finished(v_server, tag(102), NULL); op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
op->data.send_status_from_server.status_details = "xyz";
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_expect_server_shutdown(v_server, tag(0xdead)); cq_expect_server_shutdown(v_server, tag(0xdead));
cq_verify(v_server); cq_verify(v_server);
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_OK, NULL, NULL); cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
cq_verify(v_client); cq_verify(v_client);
GPR_ASSERT(status == GRPC_STATUS_UNAVAILABLE);
GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr"));
GPR_ASSERT(was_cancelled == 1);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s);
cq_verifier_destroy(v_client); cq_verifier_destroy(v_client);
cq_verifier_destroy(v_server); cq_verifier_destroy(v_server);

137
test/core/end2end/tests/invoke_large_request.c
Unescape View File

@ -107,66 +107,108 @@ static gpr_slice large_slice(void) {
} }
static void test_invoke_large_request(grpc_end2end_test_config config) { static void test_invoke_large_request(grpc_end2end_test_config config) {
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
gpr_slice request_payload_slice = large_slice();
gpr_slice response_payload_slice = large_slice();
grpc_call *c; grpc_call *c;
grpc_call *s; grpc_call *s;
gpr_slice request_payload_slice = large_slice();
grpc_byte_buffer *request_payload = grpc_byte_buffer *request_payload =
grpc_byte_buffer_create(&request_payload_slice, 1); grpc_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer *response_payload =
grpc_byte_buffer_create(&response_payload_slice, 1);
gpr_timespec deadline = n_seconds_time(30); gpr_timespec deadline = n_seconds_time(30);
grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL);
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_op ops[6];
/* byte buffer holds the slice, we can unref it already */ grpc_op *op;
gpr_slice_unref(request_payload_slice); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); grpc_metadata_array request_metadata_recv;
grpc_byte_buffer *request_payload_recv = NULL;
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_byte_buffer *response_payload_recv = NULL;
deadline); grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_details_init(&call_details);
grpc_call_start_write_old(c, request_payload, tag(4), 0));
/* destroy byte buffer early to ensure async code keeps track of its contents op = ops;
correctly */ op->op = GRPC_OP_SEND_INITIAL_METADATA;
grpc_byte_buffer_destroy(request_payload); op->data.send_initial_metadata.count = 0;
/* write should not be accepted until the server is willing to read the op++;
request (as this request is very large) */ op->op = GRPC_OP_SEND_MESSAGE;
cq_verify_empty(v_client); op->data.send_message = request_payload;
op++;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
deadline, NULL); op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message = &response_payload_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == op = ops;
grpc_call_server_accept_old(s, f.server_cq, tag(102))); op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0)); op->data.send_initial_metadata.count = 0;
cq_expect_client_metadata_read(v_client, tag(2), NULL); op++;
cq_verify(v_client); op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message = response_payload;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_read_old(s, tag(5))); op++;
/* now the write can be accepted */ op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
cq_expect_write_accepted(v_client, tag(4), GRPC_OP_OK); op->data.send_status_from_server.trailing_metadata_count = 0;
cq_verify(v_client); op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
cq_expect_read(v_server, tag(5), large_slice()); op->data.send_status_from_server.status_details = "xyz";
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message = &request_payload_recv;
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(8))); cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status_old(
s, GRPC_STATUS_UNIMPLEMENTED, "xyz", tag(9)));
cq_expect_finish_accepted(v_client, tag(8), GRPC_OP_OK);
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED,
"xyz", NULL);
cq_verify(v_client); cq_verify(v_client);
cq_expect_finish_accepted(v_server, tag(9), GRPC_OP_OK); GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
cq_expect_finished(v_server, tag(102), NULL); GPR_ASSERT(0 == strcmp(details, "xyz"));
cq_verify(v_server); GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr"));
GPR_ASSERT(was_cancelled == 0);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s); grpc_call_destroy(s);
@ -174,6 +216,11 @@ static void test_invoke_large_request(grpc_end2end_test_config config) {
cq_verifier_destroy(v_client); cq_verifier_destroy(v_client);
cq_verifier_destroy(v_server); cq_verifier_destroy(v_server);
grpc_byte_buffer_destroy(request_payload);
grpc_byte_buffer_destroy(response_payload);
grpc_byte_buffer_destroy(request_payload_recv);
grpc_byte_buffer_destroy(response_payload_recv);
end_test(&f); end_test(&f);
config.tear_down_data(&f); config.tear_down_data(&f);
} }

93
test/core/end2end/tests/max_concurrent_streams.c
Unescape View File

@ -108,38 +108,81 @@ static void simple_request_body(grpc_end2end_test_fixture f) {
gpr_timespec deadline = five_seconds_time(); gpr_timespec deadline = five_seconds_time();
cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_client = cq_verifier_create(f.client_cq);
cq_verifier *v_server = cq_verifier_create(f.server_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq);
grpc_op ops[6];
c = grpc_channel_create_call_old(f.client, "/foo", "foo.test.google.fr", grpc_op *op;
deadline); grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_status_code status;
char *details = NULL;
size_t details_capacity = 0;
int was_cancelled = 2;
c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
"foo.test.google.fr:1234", deadline);
GPR_ASSERT(c); GPR_ASSERT(c);
GPR_ASSERT(GRPC_CALL_OK == grpc_metadata_array_init(&initial_metadata_recv);
grpc_call_invoke_old(c, f.client_cq, tag(2), tag(3), 0)); grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_writes_done_old(c, tag(4))); grpc_call_details_init(&call_details);
cq_expect_finish_accepted(v_client, tag(4), GRPC_OP_OK);
cq_verify(v_client); op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call_old(f.server, tag(100))); op->data.send_initial_metadata.count = 0;
cq_expect_server_rpc_new(v_server, &s, tag(100), "/foo", "foo.test.google.fr", op++;
deadline, NULL); op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op->data.recv_status_on_client.status_details_capacity = &details_capacity;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1)));
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call(f.server, &s,
&call_details,
&request_metadata_recv,
f.server_cq, tag(101)));
cq_expect_completion(v_server, tag(101), GRPC_OP_OK);
cq_verify(v_server); cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == op = ops;
grpc_call_server_accept_old(s, f.server_cq, tag(102))); op->op = GRPC_OP_SEND_INITIAL_METADATA;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_server_end_initial_metadata_old(s, 0)); op->data.send_initial_metadata.count = 0;
cq_expect_client_metadata_read(v_client, tag(2), NULL); op++;
cq_verify(v_client); op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_UNIMPLEMENTED;
op->data.send_status_from_server.status_details = "xyz";
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102)));
cq_expect_completion(v_server, tag(102), GRPC_OP_OK);
cq_verify(v_server);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_write_status_old( cq_expect_completion(v_client, tag(1), GRPC_OP_OK);
s, GRPC_STATUS_UNIMPLEMENTED, "xyz", tag(5)));
cq_expect_finished_with_status(v_client, tag(3), GRPC_STATUS_UNIMPLEMENTED,
"xyz", NULL);
cq_verify(v_client); cq_verify(v_client);
cq_expect_finish_accepted(v_server, tag(5), GRPC_OP_OK); GPR_ASSERT(status == GRPC_STATUS_UNIMPLEMENTED);
cq_expect_finished(v_server, tag(102), NULL); GPR_ASSERT(0 == strcmp(details, "xyz"));
cq_verify(v_server); GPR_ASSERT(0 == strcmp(call_details.method, "/foo"));
GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr:1234"));
GPR_ASSERT(was_cancelled == 0);
gpr_free(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_destroy(c); grpc_call_destroy(c);
grpc_call_destroy(s); grpc_call_destroy(s);

Write Preview
Loading…
Cancel
Save