From df11214281f4815a7638618a3e8e8f06b9ca576a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 1 May 2023 18:26:37 +0200 Subject: [PATCH] [ytdl] improve --xff/--geo-bypass detection (#3989) check if --xff is supported in a try-except block and select expected results accordingly --- test/test_ytdl.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/test_ytdl.py b/test/test_ytdl.py index 54fa467b..878ac85b 100644 --- a/test/test_ytdl.py +++ b/test/test_ytdl.py @@ -235,12 +235,6 @@ class Test_CommandlineArguments(unittest.TestCase): class Test_CommandlineArguments_YtDlp(Test_CommandlineArguments): module_name = "yt_dlp" - @classmethod - def setUpClass(cls): - super().setUpClass() - if cls.module.version.__version__ > "2022.07.18": # last 3.6 release - cls.test_geo_bypass = cls._test_geo_bypass_xff - def test_retries_extractor(self): inf = float("inf") @@ -275,7 +269,13 @@ class Test_CommandlineArguments_YtDlp(Test_CommandlineArguments): "title:%(artist)s - %(title)s")], }) - def _test_geo_bypass_xff(self): + def test_geo_bypass(self): + try: + ytdl.parse_command_line(self.module, ["--xff", "default"]) + except Exception: + # before --xff (c16644642) + return Test_CommandlineArguments.test_geo_bypass(self) + self._(["--xff", "default"], "geo_bypass", "default") self._(["--xff", "never"],