Skip to content

Fix zero retry limits being ignored when cloning clients #607

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

Open
Shubham-Padkonde wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix zero retry limits being ignored when cloning clients #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions dropbox/dropbox_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,12 @@ def clone(

return self.__class__(
oauth2_access_token or self._oauth2_access_token,
max_retries_on_error or self._max_retries_on_error,
max_retries_on_rate_limit or self._max_retries_on_rate_limit,
self._max_retries_on_error if max_retries_on_error is None else max_retries_on_error,
(
self._max_retries_on_rate_limit
if max_retries_on_rate_limit is None
else max_retries_on_rate_limit
),
user_agent or self._raw_user_agent,
session or self._session,
headers or self._headers,
Expand Down
29 changes: 28 additions & 1 deletion test/unit/test_dropbox_unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
RouteResult,
USER_AUTH,
)
from dropbox.exceptions import ApiError, AuthError, BadInputError
from dropbox.exceptions import (
ApiError,
AuthError,
BadInputError,
InternalServerError,
RateLimitError,
)
from dropbox.oauth import OAuth2FlowNoRedirectResult, DropboxOAuth2FlowNoRedirect

APP_KEY = "dummy_app_key"
Expand Down Expand Up @@ -663,6 +669,27 @@ def test_non_list_scope_raises_bad_input(self, session_instance):
with pytest.raises(BadInputException):
Dropbox(oauth2_access_token=ACCESS_TOKEN, scope=12345, session=session_instance)

@pytest.mark.parametrize(
"setting, error",
[
("max_retries_on_error", InternalServerError("request-id", 500, "error")),
("max_retries_on_rate_limit", RateLimitError("request-id")),
],
)
def test_clone_can_disable_retries(self, session_instance, mocker, setting, error):
dbx = Dropbox(ACCESS_TOKEN, session=session_instance, **{setting: 2})
cloned = dbx.clone(**{setting: 0})
request = mocker.patch.object(cloned, "request_json_string", side_effect=error)
sleep = mocker.patch("dropbox.dropbox_client.time.sleep")

with pytest.raises(type(error)):
cloned.request_json_string_with_retry("api", "test", "rpc", "{}", USER_AUTH, None)

request.assert_called_once()
sleep.assert_not_called()
assert getattr(dbx, "_" + setting) == 2
assert getattr(dbx.clone(), "_" + setting) == 2

def test_clone_does_not_double_user_agent(self, session_instance):
dbx = Dropbox(
oauth2_access_token=ACCESS_TOKEN,
Expand Down
Loading