Skip to content
Snippets Groups Projects
Commit bd210c0b authored by Craig Tiller's avatar Craig Tiller Committed by GitHub
Browse files

Merge pull request #10414 from ctiller/timing

Use timeout inflation to account for differences between sanitizers
parents cbe63036 c1d43815
Branches
Tags
No related merge requests found
...@@ -168,12 +168,9 @@ static void test_max_age_forcibly_close(grpc_end2end_test_config config) { ...@@ -168,12 +168,9 @@ static void test_max_age_forcibly_close(grpc_end2end_test_config config) {
CQ_EXPECT_COMPLETION(cqv, tag(101), true); CQ_EXPECT_COMPLETION(cqv, tag(101), true);
cq_verify(cqv); cq_verify(cqv);
gpr_timespec channel_start_time = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec expect_shutdown_time = grpc_timeout_milliseconds_to_deadline(
gpr_timespec expect_shutdown_time = gpr_time_add( MAX_CONNECTION_AGE_MS + MAX_CONNECTION_AGE_GRACE_MS +
channel_start_time, IMMEDIATE_SHUTDOWN_GRACE_TIME_MS);
gpr_time_from_millis(MAX_CONNECTION_AGE_MS + MAX_CONNECTION_AGE_GRACE_MS +
IMMEDIATE_SHUTDOWN_GRACE_TIME_MS,
GPR_TIMESPAN));
/* Wait for the channel to reach its max age */ /* Wait for the channel to reach its max age */
cq_verify_empty_timeout(cqv, CQ_MAX_CONNECTION_AGE_WAIT_TIME_S); cq_verify_empty_timeout(cqv, CQ_MAX_CONNECTION_AGE_WAIT_TIME_S);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment