diff --git a/google/cloud/internal/backoff_policy.h b/google/cloud/internal/backoff_policy.h index 202327678300f..d1b1ed73e064f 100644 --- a/google/cloud/internal/backoff_policy.h +++ b/google/cloud/internal/backoff_policy.h @@ -181,8 +181,8 @@ class ExponentialBackoffPolicy : public BackoffPolicy { template ExponentialBackoffPolicy( - std::chrono::duration initial_delay_range, - std::chrono::duration minimum_delay, + std::chrono::duration minimum_delay, + std::chrono::duration initial_delay_upper_bound, std::chrono::duration maximum_delay, double scaling) : minimum_delay_(minimum_delay), initial_delay_upper_bound_(initial_delay_upper_bound), diff --git a/google/cloud/internal/backoff_policy_test.cc b/google/cloud/internal/backoff_policy_test.cc index e25f5b0669a52..f2c1f76eaf50a 100644 --- a/google/cloud/internal/backoff_policy_test.cc +++ b/google/cloud/internal/backoff_policy_test.cc @@ -43,42 +43,6 @@ TEST(ExponentialBackoffPolicy, Simple) { TEST(ExponentialBackoffPolicy, VerifyFullJitterPolicy) { ExponentialBackoffPolicy tested(ms(0), ms(10), ms(50), 2.0); - auto delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(10), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(20), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(40), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(10), delay); - EXPECT_GE(ms(100), delay); -} - -/// @test Verify a full jitter policy, where the minimum delay is set to 0. -TEST(ExponentialBackoffPolicy, VerifyFullJitterPolicy) { - ExponentialBackoffPolicy tested(ms(0), ms(10), ms(50), 2.0); - - auto delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(10), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(20), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(0), delay); - EXPECT_GE(ms(40), delay); - delay = tested.OnCompletion(); - EXPECT_LE(ms(10), delay); - EXPECT_GE(ms(100), delay); -} - -/// @test Verify a full jitter policy, where the minimum delay is set to 0. -TEST(ExponentialBackoffPolicy, VerifyFullJitterPolicy) { - ExponentialBackoffPolicy tested(ms(10), ms(0), ms(50), 2.0); - auto delay = tested.OnCompletion(); EXPECT_LE(ms(0), delay); EXPECT_GE(ms(10), delay);