Merge pull request #58 from scrapinghub/retry-502

Retry 502 responses
scrapinghub · Mar 27, 2017 · 4c3b9fc · 4c3b9fc
2 parents 2a957ba + 0f6b494
commit 4c3b9fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scrapinghub/hubstorage/client.py b/scrapinghub/hubstorage/client.py
@@ -16,7 +16,7 @@
 
 logger = logging.getLogger('HubstorageClient')
 
-_HTTP_ERROR_CODES_TO_RETRY = (408, 429, 503, 504)
+_HTTP_ERROR_CODES_TO_RETRY = (408, 429, 502, 503, 504)
 
 
 def _hc_retry_on_exception(err):

diff --git a/tests/hubstorage/test_retry.py b/tests/hubstorage/test_retry.py
@@ -4,8 +4,9 @@
 import json
 import re
 
-from mock import patch
+import pytest
 import responses
+from mock import patch
 from requests import HTTPError, ConnectionError
 from scrapinghub import HubstorageClient
 from six.moves.http_client import BadStatusLine
@@ -133,8 +134,9 @@ def test_retrier_does_not_catch_unwanted_exception(hsspiderid):
     assert attempts_count[0] == 1
 
 
+@pytest.mark.parametrize('err_code', [408, 429, 502, 503, 504])
 @responses.activate
-def test_retrier_catches_badstatusline_and_429(hsspiderid):
+def test_retrier_catches_badstatusline_and_selected_http_errors(hsspiderid, err_code):
     # Prepare
     client = hsclient_with_retries()
     job_metadata = {
@@ -152,7 +154,7 @@ def request_callback(request):
         if attempts_count[0] <= 2:
             raise ConnectionError("Connection aborted.", BadStatusLine("''"))
         if attempts_count[0] == 3:
-            return (429, {}, u'')
+            return (err_code, {}, u'')
         else:
             resp_body = dict(job_metadata)
             return (200, {}, json.dumps(resp_body))