Commit 9686b7be by Evan Brown Committed by Copybara-Service

Fix flaky test failures.

PiperOrigin-RevId: 525808747
Change-Id: I01aeef6b8558673bf1fc38a948dcecf00300b641
parent bc65499d
...@@ -72,7 +72,7 @@ class WaiterTest : public ::testing::Test { ...@@ -72,7 +72,7 @@ class WaiterTest : public ::testing::Test {
TYPED_TEST_SUITE_P(WaiterTest); TYPED_TEST_SUITE_P(WaiterTest);
constexpr absl::Duration slop = absl::Milliseconds(10); absl::Duration WithTolerance(absl::Duration d) { return d * 0.95; }
TYPED_TEST_P(WaiterTest, WaitNoTimeout) { TYPED_TEST_P(WaiterTest, WaitNoTimeout) {
absl::synchronization_internal::ThreadPool tp(1); absl::synchronization_internal::ThreadPool tp(1);
...@@ -90,7 +90,7 @@ TYPED_TEST_P(WaiterTest, WaitNoTimeout) { ...@@ -90,7 +90,7 @@ TYPED_TEST_P(WaiterTest, WaitNoTimeout) {
EXPECT_TRUE( EXPECT_TRUE(
waiter.Wait(absl::synchronization_internal::KernelTimeout::Never())); waiter.Wait(absl::synchronization_internal::KernelTimeout::Never()));
absl::Duration waited = absl::Now() - start; absl::Duration waited = absl::Now() - start;
EXPECT_GE(waited, absl::Seconds(2) - slop); EXPECT_GE(waited, WithTolerance(absl::Seconds(2)));
} }
TYPED_TEST_P(WaiterTest, WaitDurationWoken) { TYPED_TEST_P(WaiterTest, WaitDurationWoken) {
...@@ -107,7 +107,7 @@ TYPED_TEST_P(WaiterTest, WaitDurationWoken) { ...@@ -107,7 +107,7 @@ TYPED_TEST_P(WaiterTest, WaitDurationWoken) {
EXPECT_TRUE(waiter.Wait( EXPECT_TRUE(waiter.Wait(
absl::synchronization_internal::KernelTimeout(absl::Seconds(10)))); absl::synchronization_internal::KernelTimeout(absl::Seconds(10))));
absl::Duration waited = absl::Now() - start; absl::Duration waited = absl::Now() - start;
EXPECT_GE(waited, absl::Milliseconds(500) - slop); EXPECT_GE(waited, WithTolerance(absl::Milliseconds(500)));
EXPECT_LT(waited, absl::Seconds(2)); EXPECT_LT(waited, absl::Seconds(2));
} }
...@@ -125,7 +125,7 @@ TYPED_TEST_P(WaiterTest, WaitTimeWoken) { ...@@ -125,7 +125,7 @@ TYPED_TEST_P(WaiterTest, WaitTimeWoken) {
EXPECT_TRUE(waiter.Wait(absl::synchronization_internal::KernelTimeout( EXPECT_TRUE(waiter.Wait(absl::synchronization_internal::KernelTimeout(
start + absl::Seconds(10)))); start + absl::Seconds(10))));
absl::Duration waited = absl::Now() - start; absl::Duration waited = absl::Now() - start;
EXPECT_GE(waited, absl::Milliseconds(500) - slop); EXPECT_GE(waited, WithTolerance(absl::Milliseconds(500)));
EXPECT_LT(waited, absl::Seconds(2)); EXPECT_LT(waited, absl::Seconds(2));
} }
...@@ -135,7 +135,7 @@ TYPED_TEST_P(WaiterTest, WaitDurationReached) { ...@@ -135,7 +135,7 @@ TYPED_TEST_P(WaiterTest, WaitDurationReached) {
EXPECT_FALSE(waiter.Wait( EXPECT_FALSE(waiter.Wait(
absl::synchronization_internal::KernelTimeout(absl::Milliseconds(500)))); absl::synchronization_internal::KernelTimeout(absl::Milliseconds(500))));
absl::Duration waited = absl::Now() - start; absl::Duration waited = absl::Now() - start;
EXPECT_GE(waited, absl::Milliseconds(500) - slop); EXPECT_GE(waited, WithTolerance(absl::Milliseconds(500)));
EXPECT_LT(waited, absl::Seconds(1)); EXPECT_LT(waited, absl::Seconds(1));
} }
...@@ -145,7 +145,7 @@ TYPED_TEST_P(WaiterTest, WaitTimeReached) { ...@@ -145,7 +145,7 @@ TYPED_TEST_P(WaiterTest, WaitTimeReached) {
EXPECT_FALSE(waiter.Wait(absl::synchronization_internal::KernelTimeout( EXPECT_FALSE(waiter.Wait(absl::synchronization_internal::KernelTimeout(
start + absl::Milliseconds(500)))); start + absl::Milliseconds(500))));
absl::Duration waited = absl::Now() - start; absl::Duration waited = absl::Now() - start;
EXPECT_GE(waited, absl::Milliseconds(500) - slop); EXPECT_GE(waited, WithTolerance(absl::Milliseconds(500)));
EXPECT_LT(waited, absl::Seconds(1)); EXPECT_LT(waited, absl::Seconds(1));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment