aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_download.py21
-rw-r--r--test/tests.json20
2 files changed, 37 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):
diff --git a/test/tests.json b/test/tests.json
index fd9d33332..0c94c65bd 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -308,5 +308,25 @@
"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"
+ }
+ },
+ {
+ "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! "
+ }
}
]