diff options
author | 2017-04-02 10:07:14 -0700 | |
---|---|---|
committer | 2017-04-02 10:07:14 -0700 | |
commit | 8b0e90dfc9fe8095b6e9a2231a629b74b9b0dbde (patch) | |
tree | 8ac3e23d1b144ba76f1eab3677cbc48285bee792 /test/core/end2end/tests | |
parent | 6d4894e9d6cf72f0917c6cfdabb3d3a271433d34 (diff) | |
parent | bd210c0bff6c8e52f49caa1cbc129359c24e2fbf (diff) |
Merge github.com:grpc/grpc into minimal
Diffstat (limited to 'test/core/end2end/tests')
-rw-r--r-- | test/core/end2end/tests/max_connection_age.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/core/end2end/tests/max_connection_age.c b/test/core/end2end/tests/max_connection_age.c index 9cb0dc8dcc..1de54e0825 100644 --- a/test/core/end2end/tests/max_connection_age.c +++ b/test/core/end2end/tests/max_connection_age.c @@ -168,12 +168,9 @@ static void test_max_age_forcibly_close(grpc_end2end_test_config config) { CQ_EXPECT_COMPLETION(cqv, tag(101), true); cq_verify(cqv); - gpr_timespec channel_start_time = gpr_now(GPR_CLOCK_MONOTONIC); - gpr_timespec expect_shutdown_time = gpr_time_add( - channel_start_time, - gpr_time_from_millis(MAX_CONNECTION_AGE_MS + MAX_CONNECTION_AGE_GRACE_MS + - IMMEDIATE_SHUTDOWN_GRACE_TIME_MS, - GPR_TIMESPAN)); + gpr_timespec expect_shutdown_time = grpc_timeout_milliseconds_to_deadline( + MAX_CONNECTION_AGE_MS + MAX_CONNECTION_AGE_GRACE_MS + + IMMEDIATE_SHUTDOWN_GRACE_TIME_MS); /* Wait for the channel to reach its max age */ cq_verify_empty_timeout(cqv, CQ_MAX_CONNECTION_AGE_WAIT_TIME_S); |