Skip to content

Commit

Permalink
Reduce wait_exponential power by 1 so first wait is equal to multiplier
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyounkins
cyounkins committed Jun 20, 2019
1 parent 55aa17c commit aac4307
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 48 deletions.
104 changes: 57 additions & 47 deletions tenacity/tests/test_tenacity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,23 +188,26 @@ def test_random_sleep_without_min(self):
self.assertTrue(t <= 2)

def test_exponential(self):
r = Retrying(wait=tenacity.wait_exponential(max=100))
self.assertEqual(r.wait(1, 0), 2)
self.assertEqual(r.wait(2, 0), 4)
self.assertEqual(r.wait(3, 0), 8)
self.assertEqual(r.wait(4, 0), 16)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 64)
r = Retrying(wait=tenacity.wait_exponential())
self.assertEqual(r.wait(1, 0), 1)
self.assertEqual(r.wait(2, 0), 2)
self.assertEqual(r.wait(3, 0), 4)
self.assertEqual(r.wait(4, 0), 8)
self.assertEqual(r.wait(5, 0), 16)
self.assertEqual(r.wait(6, 0), 32)
self.assertEqual(r.wait(7, 0), 64)
self.assertEqual(r.wait(8, 0), 128)

def test_exponential_with_max_wait(self):
r = Retrying(wait=tenacity.wait_exponential(max=40))
self.assertEqual(r.wait(1, 0), 2)
self.assertEqual(r.wait(2, 0), 4)
self.assertEqual(r.wait(3, 0), 8)
self.assertEqual(r.wait(4, 0), 16)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 40)
self.assertEqual(r.wait(1, 0), 1)
self.assertEqual(r.wait(2, 0), 2)
self.assertEqual(r.wait(3, 0), 4)
self.assertEqual(r.wait(4, 0), 8)
self.assertEqual(r.wait(5, 0), 16)
self.assertEqual(r.wait(6, 0), 32)
self.assertEqual(r.wait(7, 0), 40)
self.assertEqual(r.wait(8, 0), 40)
self.assertEqual(r.wait(50, 0), 40)

def test_exponential_with_min_wait(self):
Expand All @@ -213,21 +216,23 @@ def test_exponential_with_min_wait(self):
self.assertEqual(r.wait(2, 0), 20)
self.assertEqual(r.wait(3, 0), 20)
self.assertEqual(r.wait(4, 0), 20)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 64)
self.assertEqual(r.wait(7, 0), 128)
self.assertEqual(r.wait(20, 0), 1048576)
self.assertEqual(r.wait(5, 0), 20)
self.assertEqual(r.wait(6, 0), 32)
self.assertEqual(r.wait(7, 0), 64)
self.assertEqual(r.wait(8, 0), 128)
self.assertEqual(r.wait(20, 0), 524288)

def test_exponential_with_max_wait_and_multiplier(self):
r = Retrying(wait=tenacity.wait_exponential(
max=50, multiplier=1))
self.assertEqual(r.wait(1, 0), 2)
self.assertEqual(r.wait(2, 0), 4)
self.assertEqual(r.wait(3, 0), 8)
self.assertEqual(r.wait(4, 0), 16)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 50)
self.assertEqual(r.wait(1, 0), 1)
self.assertEqual(r.wait(2, 0), 2)
self.assertEqual(r.wait(3, 0), 4)
self.assertEqual(r.wait(4, 0), 8)
self.assertEqual(r.wait(5, 0), 16)
self.assertEqual(r.wait(6, 0), 32)
self.assertEqual(r.wait(7, 0), 50)
self.assertEqual(r.wait(8, 0), 50)
self.assertEqual(r.wait(50, 0), 50)

def test_exponential_with_min_wait_and_multiplier(self):
Expand All @@ -236,21 +241,24 @@ def test_exponential_with_min_wait_and_multiplier(self):
self.assertEqual(r.wait(1, 0), 20)
self.assertEqual(r.wait(2, 0), 20)
self.assertEqual(r.wait(3, 0), 20)
self.assertEqual(r.wait(4, 0), 32)
self.assertEqual(r.wait(5, 0), 64)
self.assertEqual(r.wait(6, 0), 128)
self.assertEqual(r.wait(7, 0), 256)
self.assertEqual(r.wait(20, 0), 2097152)
self.assertEqual(r.wait(4, 0), 20)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 64)
self.assertEqual(r.wait(7, 0), 128)
self.assertEqual(r.wait(8, 0), 256)
self.assertEqual(r.wait(20, 0), 1048576)

def test_exponential_with_min_wait_and_max_wait(self):
r = Retrying(wait=tenacity.wait_exponential(min=10, max=100))
self.assertEqual(r.wait(1, 0), 10)
self.assertEqual(r.wait(2, 0), 10)
self.assertEqual(r.wait(3, 0), 10)
self.assertEqual(r.wait(4, 0), 16)
self.assertEqual(r.wait(5, 0), 32)
self.assertEqual(r.wait(6, 0), 64)
self.assertEqual(r.wait(7, 0), 100)
self.assertEqual(r.wait(4, 0), 10)
self.assertEqual(r.wait(5, 0), 16)
self.assertEqual(r.wait(6, 0), 32)
self.assertEqual(r.wait(7, 0), 64)
self.assertEqual(r.wait(8, 0), 100)
self.assertEqual(r.wait(9, 0), 100)
self.assertEqual(r.wait(20, 0), 100)

def test_legacy_explicit_wait_type(self):
Expand Down Expand Up @@ -375,19 +383,21 @@ def test_wait_random_exponential(self):
fn = tenacity.wait_random_exponential(0.5, 60.0)

for _ in six.moves.range(1000):
self._assert_inclusive_range(fn(make_retry_state(1, 0)), 0, 1.0)
self._assert_inclusive_range(fn(make_retry_state(2, 0)), 0, 2.0)
self._assert_inclusive_range(fn(make_retry_state(3, 0)), 0, 4.0)
self._assert_inclusive_range(fn(make_retry_state(4, 0)), 0, 8.0)
self._assert_inclusive_range(fn(make_retry_state(5, 0)), 0, 16.0)
self._assert_inclusive_range(fn(make_retry_state(6, 0)), 0, 32.0)
self._assert_inclusive_range(fn(make_retry_state(7, 0)), 0, 60.0)
self._assert_inclusive_range(fn(make_retry_state(1, 0)), 0, 0.5)
self._assert_inclusive_range(fn(make_retry_state(2, 0)), 0, 1.0)
self._assert_inclusive_range(fn(make_retry_state(3, 0)), 0, 2.0)
self._assert_inclusive_range(fn(make_retry_state(4, 0)), 0, 4.0)
self._assert_inclusive_range(fn(make_retry_state(5, 0)), 0, 8.0)
self._assert_inclusive_range(fn(make_retry_state(6, 0)), 0, 16.0)
self._assert_inclusive_range(fn(make_retry_state(7, 0)), 0, 32.0)
self._assert_inclusive_range(fn(make_retry_state(8, 0)), 0, 60.0)
self._assert_inclusive_range(fn(make_retry_state(9, 0)), 0, 60.0)

fn = tenacity.wait_random_exponential(10, 5)
for _ in six.moves.range(1000):
self._assert_inclusive_range(fn(make_retry_state(1, 0)), 0.00, 5.00)
self._assert_inclusive_range(
fn(make_retry_state(1, 0)), 0.00, 5.00
)

# Default arguments exist
fn = tenacity.wait_random_exponential()
Expand All @@ -406,13 +416,13 @@ def mean(lst):
return float(sum(lst)) / float(len(lst))

# skipping attempt 0
self._assert_inclusive_epsilon(mean(attempt[1]), 0.50, 0.04)
self._assert_inclusive_epsilon(mean(attempt[2]), 1, 0.08)
self._assert_inclusive_epsilon(mean(attempt[3]), 2, 0.16)
self._assert_inclusive_epsilon(mean(attempt[4]), 4, 0.32)
self._assert_inclusive_epsilon(mean(attempt[5]), 8, 0.64)
self._assert_inclusive_epsilon(mean(attempt[6]), 16, 1.28)
self._assert_inclusive_epsilon(mean(attempt[7]), 30, 2.56)
self._assert_inclusive_epsilon(mean(attempt[1]), 0.25, 0.02)
self._assert_inclusive_epsilon(mean(attempt[2]), 0.50, 0.04)
self._assert_inclusive_epsilon(mean(attempt[3]), 1, 0.08)
self._assert_inclusive_epsilon(mean(attempt[4]), 2, 0.16)
self._assert_inclusive_epsilon(mean(attempt[5]), 4, 0.32)
self._assert_inclusive_epsilon(mean(attempt[6]), 8, 0.64)
self._assert_inclusive_epsilon(mean(attempt[7]), 16, 1.28)
self._assert_inclusive_epsilon(mean(attempt[8]), 30, 2.56)
self._assert_inclusive_epsilon(mean(attempt[9]), 30, 2.56)

Expand Down
2 changes: 1 addition & 1 deletion tenacity/wait.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def __init__(self, multiplier=1, max=_utils.MAX_WAIT, exp_base=2, min=0): # noq
@_compat.wait_dunder_call_accept_old_params
def __call__(self, retry_state):
try:
exp = self.exp_base ** retry_state.attempt_number
exp = self.exp_base ** (retry_state.attempt_number - 1)
result = self.multiplier * exp
except OverflowError:
return self.max
Expand Down

0 comments on commit aac4307

Please sign in to comment.