Merge pull request kivy#2291 from obfusk/patch-9

AndreMiras · web-flow · commit 6235e93f218f · 2020-08-11T22:36:18.000+02:00
download_file: show error + exponential sleep
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -191,15 +191,17 @@ def report_hook(index, blksize, size):
 
             # Download item with multiple attempts (for bad connections):
             attempts = 0
+            seconds = 1
             while True:
                 try:
                     urlretrieve(url, target, report_hook)
-                except OSError:
+                except OSError as e:
                     attempts += 1
                     if attempts >= 5:
                         raise
-                    stdout.write('Download failed retrying in a second...')
-                    time.sleep(1)
+                    stdout.write('Download failed: {}; retrying in {} second(s)...'.format(e, seconds))
+                    time.sleep(seconds)
+                    seconds *= 2
                     continue
                 break
             return target
diff --git a/tests/test_recipe.py b/tests/test_recipe.py
@@ -179,7 +179,7 @@ def test_download_file_scheme_https_oserror(self):
         retry = 5
         expected_call_args_list = [mock.call(url, filename, mock.ANY)] * retry
         assert m_urlretrieve.call_args_list == expected_call_args_list
-        expected_call_args_list = [mock.call(1)] * (retry - 1)
+        expected_call_args_list = [mock.call(2**i) for i in range(retry - 1)]
         assert m_sleep.call_args_list == expected_call_args_list
 
 
