about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-02-06 04:19:55 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-02-06 04:19:57 +0100
commitdcf3eec47a0519b424961b43c7ec1de48d2095dc (patch)
tree4ee16f5c42d9348b259887e23697d260444752fe
parente9e4f30d26e2e87b1b3a073a5000ccb6dcf72325 (diff)
downloadyoutube-dl-dcf3eec47a0519b424961b43c7ec1de48d2095dc.tar.gz
youtube-dl-dcf3eec47a0519b424961b43c7ec1de48d2095dc.tar.xz
youtube-dl-dcf3eec47a0519b424961b43c7ec1de48d2095dc.zip
[test_download] Skip over BadStatusLine errors
An error like https://travis-ci.org/rg3/youtube-dl/jobs/18317799#L449 is almost certainly the server's fault.
-rw-r--r--test/test_download.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 0d925ae69..7587a18aa 100644
--- 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 (
+    compat_http_client,
     compat_str,
     compat_urllib_error,
     compat_HTTPError,
@@ -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
-                    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: