Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix retry.with_delay multiplier parameter handling #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 31, 2021
Merged

Fix retry.with_delay multiplier parameter handling #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebf1b8f
fix: Retry.with_retry setting None multiplier
Mar 30, 2021
30f811a
test: Update test_with_delay assertion
quentin-sommer Mar 31, 2021
ae1e181
test: Add retry.with_delay test with partial options
quentin-sommer Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/api_core/retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def with_delay(self, initial=None, maximum=None, multiplier=None):
predicate=self._predicate,
initial=initial if initial is not None else self._initial,
maximum=maximum if maximum is not None else self._maximum,
multiplier=multiplier if maximum is not None else self._multiplier,
multiplier=multiplier if multiplier is not None else self._multiplier,
deadline=self._deadline,
on_error=self._on_error,
)
Expand Down
36 changes: 34 additions & 2 deletions tests/unit/test_retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,44 @@ def test_with_delay(self):
deadline=4,
on_error=mock.sentinel.on_error,
)
new_retry = retry_.with_delay(initial=1, maximum=2, multiplier=3)
new_retry = retry_.with_delay(initial=5, maximum=6, multiplier=7)
assert retry_ is not new_retry
assert new_retry._initial == 1
assert new_retry._initial == 5
assert new_retry._maximum == 6
assert new_retry._multiplier == 7

# the rest of the attributes should remain the same
assert new_retry._deadline == retry_._deadline
assert new_retry._predicate is retry_._predicate
assert new_retry._on_error is retry_._on_error

def test_with_delay_partial_options(self):
retry_ = retry.Retry(
predicate=mock.sentinel.predicate,
initial=1,
maximum=2,
multiplier=3,
deadline=4,
on_error=mock.sentinel.on_error,
)
new_retry = retry_.with_delay(initial=4)
assert retry_ is not new_retry
assert new_retry._initial == 4
assert new_retry._maximum == 2
assert new_retry._multiplier == 3

new_retry = retry_.with_delay(maximum=4)
assert retry_ is not new_retry
assert new_retry._initial == 1
assert new_retry._maximum == 4
assert new_retry._multiplier == 3

new_retry = retry_.with_delay(multiplier=4)
assert retry_ is not new_retry
assert new_retry._initial == 1
assert new_retry._maximum == 2
assert new_retry._multiplier == 4

# the rest of the attributes should remain the same
assert new_retry._deadline == retry_._deadline
assert new_retry._predicate is retry_._predicate
Expand Down