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 From 44e939514ebb37f002bc9a2663e8669c3a201da8 Mon Sep 17 00:00:00 2001 From: Johny Mo Swag Date: Thu, 28 Mar 2013 20:05:28 -0700 Subject: Added test for WorldStarHipHop --- test/tests.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index 7af3c2892..4190c5387 100644 --- a/test/tests.json +++ b/test/tests.json @@ -293,5 +293,14 @@ "info_dict": { "title": "Absolute Mehrheit vom 17.02.2013 - Die Highlights, Teil 2" } + }, + { + "name": "WorldStarHipHop", + "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO", + "file": "wshh6a7q1ny0G34ZwuIO.mp4", + "md5": "9d04de741161603bf7071bbf4e883186", + "info_dict": { + "title": "Video: KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick! " + } } ] -- cgit v1.2.3 From 0cd358676c06cc5915b3fb98388645833da4d7e0 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Fri, 29 Mar 2013 15:13:24 +0100 Subject: Rebased, fixed and extended LiveLeak.com support close #757 - close #761 --- test/tests.json | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'test') diff --git a/test/tests.json b/test/tests.json index fd9d33332..929d454ff 100644 --- a/test/tests.json +++ b/test/tests.json @@ -308,5 +308,16 @@ "info_dict": { "title": "Vulkanausbruch in Ecuador: Der \"Feuerschlund\" ist wieder aktiv" } + }, + { + "name": "LiveLeak", + "md5": "0813c2430bea7a46bf13acf3406992f4", + "url": "http://www.liveleak.com/view?i=757_1364311680", + "file": "757_1364311680.mp4", + "info_dict": { + "title": "Most unlucky car accident", + "description": "extremely bad day for this guy..!", + "uploader": "ljfriel2" + } } ] -- cgit v1.2.3 From f375d4b7de17b1ac3d8fda9d4f071e1e55be1963 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 31 Mar 2013 03:12:28 +0200 Subject: import all IEs when testing to resemble more closely the real env --- test/test_download.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index a8de1d002..e29092c45 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -81,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': -- cgit v1.2.3 From 90a99c1b5e01b86c793fb9ecb80a2521d8ae0f79 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sun, 31 Mar 2013 03:29:34 +0200 Subject: retry on UnavailableVideoError --- test/test_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test_download.py b/test/test_download.py index e29092c45..59a6e1498 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -102,7 +102,7 @@ def generator(test_case): 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): + 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)) -- cgit v1.2.3