|
|
|
@ -57,16 +57,18 @@ static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, |
|
|
|
|
return f; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static gpr_timespec n_seconds_time(int n) { |
|
|
|
|
static gpr_timespec n_seconds_from_now(int n) { |
|
|
|
|
return grpc_timeout_seconds_to_deadline(n); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } |
|
|
|
|
static gpr_timespec five_seconds_from_now(void) { |
|
|
|
|
return n_seconds_from_now(5); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void drain_cq(grpc_completion_queue *cq) { |
|
|
|
|
grpc_event ev; |
|
|
|
|
do { |
|
|
|
|
ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); |
|
|
|
|
ev = grpc_completion_queue_next(cq, five_seconds_from_now(), NULL); |
|
|
|
|
} while (ev.type != GRPC_QUEUE_SHUTDOWN); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -99,7 +101,6 @@ static void simple_request_body(grpc_end2end_test_config config, |
|
|
|
|
grpc_end2end_test_fixture f) { |
|
|
|
|
grpc_call *c; |
|
|
|
|
grpc_call *s; |
|
|
|
|
gpr_timespec deadline = five_seconds_time(); |
|
|
|
|
cq_verifier *cqv = cq_verifier_create(f.cq); |
|
|
|
|
grpc_op ops[6]; |
|
|
|
|
grpc_op *op; |
|
|
|
@ -112,6 +113,7 @@ static void simple_request_body(grpc_end2end_test_config config, |
|
|
|
|
grpc_slice details; |
|
|
|
|
int was_cancelled = 2; |
|
|
|
|
|
|
|
|
|
gpr_timespec deadline = five_seconds_from_now(); |
|
|
|
|
c = grpc_channel_create_call( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/foo"), |
|
|
|
@ -257,7 +259,7 @@ static void test_max_concurrent_streams(grpc_end2end_test_config config) { |
|
|
|
|
|
|
|
|
|
/* start two requests - ensuring that the second is not accepted until
|
|
|
|
|
the first completes */ |
|
|
|
|
deadline = n_seconds_time(1000); |
|
|
|
|
deadline = n_seconds_from_now(1000); |
|
|
|
|
c1 = grpc_channel_create_call( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/alpha"), |
|
|
|
@ -502,13 +504,13 @@ static void test_max_concurrent_streams_with_timeout_on_first( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/alpha"), |
|
|
|
|
get_host_override_slice("foo.test.google.fr:1234", config), |
|
|
|
|
n_seconds_time(3), NULL); |
|
|
|
|
n_seconds_from_now(3), NULL); |
|
|
|
|
GPR_ASSERT(c1); |
|
|
|
|
c2 = grpc_channel_create_call( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/beta"), |
|
|
|
|
get_host_override_slice("foo.test.google.fr:1234", config), |
|
|
|
|
n_seconds_time(1000), NULL); |
|
|
|
|
n_seconds_from_now(1000), NULL); |
|
|
|
|
GPR_ASSERT(c2); |
|
|
|
|
|
|
|
|
|
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( |
|
|
|
@ -697,13 +699,13 @@ static void test_max_concurrent_streams_with_timeout_on_second( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/alpha"), |
|
|
|
|
get_host_override_slice("foo.test.google.fr:1234", config), |
|
|
|
|
n_seconds_time(1000), NULL); |
|
|
|
|
n_seconds_from_now(1000), NULL); |
|
|
|
|
GPR_ASSERT(c1); |
|
|
|
|
c2 = grpc_channel_create_call( |
|
|
|
|
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, |
|
|
|
|
grpc_slice_from_static_string("/beta"), |
|
|
|
|
get_host_override_slice("foo.test.google.fr:1234", config), |
|
|
|
|
n_seconds_time(3), NULL); |
|
|
|
|
n_seconds_from_now(3), NULL); |
|
|
|
|
GPR_ASSERT(c2); |
|
|
|
|
|
|
|
|
|
GPR_ASSERT(GRPC_CALL_OK == grpc_server_request_call( |
|
|
|
|