diff options
author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-04-05 12:39:51 +0200 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-04-05 12:39:51 +0200 |
commit | 14294236bf9623fac4ad748389689b77d52b3547 (patch) | |
tree | dcc1370a9568c6e3f015f6cf36d874b7cc2ac994 /test/test_download.py | |
parent | 7eab8dc7504cf1f5f1dd03eb62e266ce24948b93 (diff) | |
parent | c2b293ba3021d323a3d8ccbabeb3ebb993b276aa (diff) | |
download | youtube-dl-14294236bf9623fac4ad748389689b77d52b3547.tar.xz |
Merge branch 'master' into extract_info_rewrite
Diffstat (limited to 'test/test_download.py')
-rw-r--r-- | test/test_download.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/test/test_download.py b/test/test_download.py index f1bccf58c..59a6e1498 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) @@ -79,9 +81,8 @@ def generator(test_case): params.update(test_case.get('params', {})) fd = FileDownloader(params) - fd.add_info_extractor(ie()) - for ien in test_case.get('add_ie', []): - fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')()) + for ie in youtube_dl.InfoExtractors.gen_extractors(): + fd.add_info_extractor(ie) finished_hook_called = set() def _hook(status): if status['status'] == 'finished': @@ -94,7 +95,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 (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError): + 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): |