From 8cc83b8dbea6e4f34f483c4a209158307df566f0 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 9 Mar 2013 10:05:43 +0100 Subject: Bubble up all the stack of exceptions and retry download tests on timeout errors --- test/test_download.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index f1bccf58c..a8de1d002 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -20,6 +20,8 @@ from youtube_dl.utils import * DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json') PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") +RETRIES = 3 + # General configuration (from __init__, not very elegant...) jar = compat_cookiejar.CookieJar() cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) @@ -94,7 +96,19 @@ def generator(test_case): _try_rm(tc['file'] + '.part') _try_rm(tc['file'] + '.info.json') try: - fd.download([test_case['url']]) + for retry in range(1, RETRIES + 1): + try: + fd.download([test_case['url']]) + except (DownloadError, ExtractorError) as err: + if retry == RETRIES: raise + + # Check if the exception is not a network related one + if not err.exc_info[0] in (ZeroDivisionError, compat_urllib_error.URLError, socket.timeout): + raise + + print('Retrying: {0} failed tries\n\n##########\n\n'.format(retry)) + else: + break for tc in test_cases: if not test_case.get('params', {}).get('skip_download', False): -- cgit v1.2.3