[test] Fix `FakeYDL` signatures

Authored by: coletdjnz

diff --git a/test/helper.py b/test/helper.py
index 2333ace988719972fa782d37f6824d397c575f76..5a389b8c486751532a2017d5c2df086c5cfbf16e 100644 (file)
--- 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 @@ def __init__(self, override=None):
         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 @@ def expect_warning(self, regex):
         # 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 03a2c36a1c7c647fedd5eae92622a3ddb9837d0a..15ad15115fc7f6f95afef612250b70b93f0743bc 100644 (file)
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -40,7 +40,7 @@ def __init__(self, *args, **kwargs):
     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 5bfaec367802db8f92650d1dcbcb39d6d833c664..cfeb11b5526de124a87697700306d3820e72c325 100644 (file)
--- a/test/test_cookies.py
+++ b/test/test_cookies.py
@@ -14,16 +14,16 @@
 
 
 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 f38f5544e602eb6fad6aced7d652319980167853..c9825c0742b56b894e8c49dcfee6826cc7bcefc9 100755 (executable)
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs):
         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)