From f0500bd1e4e3910abd58a1be812ba35fc20049e7 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Tue, 21 Jun 2022 12:51:46 +0530 Subject: [PATCH] [test] Fix `FakeYDL` signatures Authored by: coletdjnz --- test/helper.py | 14 +++++++------- test/test_YoutubeDL.py | 2 +- test/test_cookies.py | 8 ++++---- test/test_download.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/helper.py b/test/helper.py index 2333ace98..5a389b8c4 100644 --- a/test/helper.py +++ b/test/helper.py @@ -44,7 +44,7 @@ def try_rm(filename): raise -def report_warning(message): +def report_warning(message, *args, **kwargs): ''' Print the message to stderr, it will be prefixed with 'WARNING:' If stderr is a tty file the 'WARNING:' will be colored @@ -67,10 +67,10 @@ class FakeYDL(YoutubeDL): super().__init__(params, auto_init=False) self.result = [] - def to_screen(self, s, skip_eol=None): + def to_screen(self, s, *args, **kwargs): print(s) - def trouble(self, s, tb=None): + def trouble(self, s, *args, **kwargs): raise Exception(s) def download(self, x): @@ -80,10 +80,10 @@ class FakeYDL(YoutubeDL): # Silence an expected warning matching a regex old_report_warning = self.report_warning - def report_warning(self, message): + def report_warning(self, message, *args, **kwargs): if re.match(regex, message): return - old_report_warning(message) + old_report_warning(message, *args, **kwargs) self.report_warning = types.MethodType(report_warning, self) @@ -301,9 +301,9 @@ def assertEqual(self, got, expected, msg=None): def expect_warnings(ydl, warnings_re): real_warning = ydl.report_warning - def _report_warning(w): + def _report_warning(w, *args, **kwargs): if not any(re.search(w_re, w) for w_re in warnings_re): - real_warning(w) + real_warning(w, *args, **kwargs) ydl.report_warning = _report_warning diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py index 03a2c36a1..15ad15115 100644 --- a/test/test_YoutubeDL.py +++ b/test/test_YoutubeDL.py @@ -40,7 +40,7 @@ class YDL(FakeYDL): def process_info(self, info_dict): self.downloaded_info_dicts.append(info_dict.copy()) - def to_screen(self, msg): + def to_screen(self, msg, *args, **kwargs): self.msgs.append(msg) def dl(self, *args, **kwargs): diff --git a/test/test_cookies.py b/test/test_cookies.py index 5bfaec367..cfeb11b55 100644 --- a/test/test_cookies.py +++ b/test/test_cookies.py @@ -14,16 +14,16 @@ from yt_dlp.cookies import ( class Logger: - def debug(self, message): + def debug(self, message, *args, **kwargs): print(f'[verbose] {message}') - def info(self, message): + def info(self, message, *args, **kwargs): print(message) - def warning(self, message, only_once=False): + def warning(self, message, *args, **kwargs): self.error(message) - def error(self, message): + def error(self, message, *args, **kwargs): raise Exception(message) 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)