From 6d1b34896e69c4e53d8f960bf4b3867bca1c129c Mon Sep 17 00:00:00 2001 From: pukkandan Date: Mon, 20 Jun 2022 10:14:12 +0530 Subject: Update to ytdl-commit-8a158a9 [NHK] Use new API URL https://github.com/ytdl-org/youtube-dl/commit/6508688e88c83bb811653083db9351702cd39a6a Closes #2337, Closes #4063 --- test/test_download.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/test_download.py') diff --git a/test/test_download.py b/test/test_download.py index 9a83bee2f..f38f5544e 100755 --- a/test/test_download.py +++ b/test/test_download.py @@ -102,9 +102,10 @@ def generator(test_case, tname): def print_skipping(reason): print('Skipping %s: %s' % (test_case['name'], reason)) + self.skipTest(reason) + if not ie.working(): print_skipping('IE marked as not _WORKING') - return for tc in test_cases: info_dict = tc.get('info_dict', {}) @@ -118,11 +119,10 @@ def generator(test_case, tname): if 'skip' in test_case: print_skipping(test_case['skip']) - return + for other_ie in other_ies: if not other_ie.working(): print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key()) - return params = get_params(test_case.get('params', {})) params['outtmpl'] = tname + '_' + params['outtmpl'] -- cgit v1.2.3 From f0500bd1e4e3910abd58a1be812ba35fc20049e7 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Tue, 21 Jun 2022 12:51:46 +0530 Subject: [test] Fix `FakeYDL` signatures Authored by: coletdjnz --- test/test_download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test_download.py') diff --git a/test/test_download.py b/test/test_download.py index f38f5544e..c9825c074 100755 --- a/test/test_download.py +++ b/test/test_download.py @@ -43,7 +43,7 @@ class YoutubeDL(yt_dlp.YoutubeDL): self.processed_info_dicts = [] super().__init__(*args, **kwargs) - def report_warning(self, message): + def report_warning(self, message, *args, **kwargs): # Don't accept warnings during tests raise ExtractorError(message) -- cgit v1.2.3 From ac668111128b5f124b4271b3aa4c35f6e71a4749 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 24 Jun 2022 13:40:17 +0530 Subject: [compat] Remove more functions Removing any more will require changes to a large number of extractors --- test/test_download.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'test/test_download.py') diff --git a/test/test_download.py b/test/test_download.py index c9825c074..b82f174bb 100755 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,14 +1,18 @@ #!/usr/bin/env python3 # Allow direct execution -import hashlib -import json import os -import socket import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +import hashlib +import json +import socket +import urllib.error +import http.client + from test.helper import ( assertGreaterEqual, expect_info_dict, @@ -19,13 +23,8 @@ from test.helper import ( report_warning, try_rm, ) - -import yt_dlp.YoutubeDL -from yt_dlp.compat import ( - compat_http_client, - compat_HTTPError, - compat_urllib_error, -) +import yt_dlp.YoutubeDL # isort: split +from yt_dlp.compat import compat_HTTPError from yt_dlp.extractor import get_info_extractor from yt_dlp.utils import ( DownloadError, @@ -167,7 +166,7 @@ def generator(test_case, tname): force_generic_extractor=params.get('force_generic_extractor', False)) 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, compat_http_client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503): + if not err.exc_info[0] in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503): raise if try_num == RETRIES: -- cgit v1.2.3 From 54007a45f11ed730352324289b714baefd2901eb Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 24 Jun 2022 16:36:16 +0530 Subject: [cleanup] Consistent style for file heads --- test/test_download.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/test_download.py') diff --git a/test/test_download.py b/test/test_download.py index b82f174bb..b98ddebcb 100755 --- a/test/test_download.py +++ b/test/test_download.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 + # Allow direct execution import os import sys @@ -8,10 +9,10 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import hashlib +import http.client import json import socket import urllib.error -import http.client from test.helper import ( assertGreaterEqual, @@ -23,6 +24,7 @@ from test.helper import ( report_warning, try_rm, ) + import yt_dlp.YoutubeDL # isort: split from yt_dlp.compat import compat_HTTPError from yt_dlp.extractor import get_info_extractor -- cgit v1.2.3 From 14f25df2b6233553e968df023430ca96c0b1df9f Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 24 Jun 2022 16:24:43 +0530 Subject: [compat] Remove deprecated functions from core code --- test/test_download.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/test_download.py') diff --git a/test/test_download.py b/test/test_download.py index b98ddebcb..b397b3ecf 100755 --- a/test/test_download.py +++ b/test/test_download.py @@ -26,7 +26,6 @@ from test.helper import ( ) import yt_dlp.YoutubeDL # isort: split -from yt_dlp.compat import compat_HTTPError from yt_dlp.extractor import get_info_extractor from yt_dlp.utils import ( DownloadError, @@ -168,7 +167,7 @@ def generator(test_case, tname): force_generic_extractor=params.get('force_generic_extractor', False)) except (DownloadError, ExtractorError) as err: # Check if the exception is not a network related one - if not err.exc_info[0] in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine) or (err.exc_info[0] == compat_HTTPError and err.exc_info[1].code == 503): + if not err.exc_info[0] in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine) or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503): raise if try_num == RETRIES: -- cgit v1.2.3