debian/changelog: Describe a bit what this new version brings us.

[youtubedl] / test / test_download.py

diff --git a/test/test_download.py b/test/test_download.py
index dd5818dba91c166936e45f1c7d8779c752fa3b86..7587a18aa18fee1cdf61a735246c62dbf91e691d 100644 (file)
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -22,6 +22,7 @@ import socket
 
 import youtube_dl.YoutubeDL
 from youtube_dl.utils import (
 
 import youtube_dl.YoutubeDL
 from youtube_dl.utils import (

+    compat_http_client,

     compat_str,
     compat_urllib_error,
     compat_HTTPError,
     compat_str,
     compat_urllib_error,
     compat_HTTPError,


@@ -90,7 +91,7 @@ def generator(test_case):
         def _hook(status):
             if status['status'] == 'finished':
                 finished_hook_called.add(status['filename'])
         def _hook(status):
             if status['status'] == 'finished':
                 finished_hook_called.add(status['filename'])

-        ydl.fd.add_progress_hook(_hook)
+        ydl.add_progress_hook(_hook)

 
         def get_tc_filename(tc):
             return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))
 
         def get_tc_filename(tc):
             return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {}))


@@ -110,7 +111,7 @@ def generator(test_case):
                     ydl.download([test_case['url']])
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
                     ydl.download([test_case['url']])
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one

-                    if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):
+                    if not err.exc_info[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503):

                         raise
 
                     if try_num == RETRIES:
                         raise
 
                     if try_num == RETRIES:


@@ -148,7 +149,7 @@ def generator(test_case):
                     for key, value in info_dict.items()
                     if value and key in ('title', 'description', 'uploader', 'upload_date', 'uploader_id', 'location'))
                 if not all(key in tc.get('info_dict', {}).keys() for key in test_info_dict.keys()):
                     for key, value in info_dict.items()
                     if value and key in ('title', 'description', 'uploader', 'upload_date', 'uploader_id', 'location'))
                 if not all(key in tc.get('info_dict', {}).keys() for key in test_info_dict.keys()):

-                    sys.stderr.write(u'\n"info_dict": ' + json.dumps(test_info_dict, ensure_ascii=False, indent=2) + u'\n')
+                    sys.stderr.write(u'\n"info_dict": ' + json.dumps(test_info_dict, ensure_ascii=False, indent=4) + u'\n')

 
                 # Check for the presence of mandatory fields
                 for key in ('id', 'url', 'title', 'ext'):
 
                 # Check for the presence of mandatory fields
                 for key in ('id', 'url', 'title', 'ext'):