Skip to content

fix(http): sleep only when another retry is scheduled #696

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
AshSgDe29071999 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(http): sleep only when another retry is scheduled #696

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
6 changes: 5 additions & 1 deletion cliboa/adapter/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def request(self):
def execute(self):
self._logger.info("local path: %s" % self._dest_path)
res = None
for _ in range(self._retry_cnt):
for attempt in range(self._retry_cnt):
try:
res = self.request()
res.raise_for_status()
Expand All @@ -55,6 +55,10 @@ def execute(self):
except Exception as e:
self._logger.warning(e)

# Sleep only when another attempt will follow.
if attempt + 1 >= self._retry_cnt:
break

self._logger.warning(
"Unexpected error occurred during http request. Retry will start in %s",
self._retry_intvl_sec,
Expand Down
14 changes: 14 additions & 0 deletions tests/adapter/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ def test_execute_ng(self, mock_get):
d.execute()
assert "Http request failed" in str(execinfo.value)

@patch("cliboa.adapter.http.sleep")
@patch("cliboa.adapter.http.requests.get")
def test_execute_ng_no_sleep_on_final_attempt(self, mock_get, mock_sleep):
mock_get.side_effect = HTTPError("Http request failed.")

url = "https://spam.com/get"
timeout = 1
retry_cnt = 1
retry_intvl_sec = 1
d = Download(url, self._dest_path, timeout, retry_cnt, retry_intvl_sec)
with pytest.raises(HTTPError):
d.execute()
mock_sleep.assert_not_called()


class TestUpload(object):
def setup_method(self, method):
Expand Down