From 42ded0a429c20ec13dc006825e1508d9a02f0ad4 Mon Sep 17 00:00:00 2001 From: bashonly Date: Sat, 15 Jul 2023 15:18:25 -0500 Subject: [fd/external] Fixes to cookie handling - Fix bug in `axel` Cookie header arg - Pass cookies to `curl` as strings - Write session cookies for `aria2c` and `wget` Closes #7539 Authored by: bashonly --- test/test_downloader_external.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/test_downloader_external.py b/test/test_downloader_external.py index e5b02ba5a..d3d74df04 100644 --- a/test/test_downloader_external.py +++ b/test/test_downloader_external.py @@ -68,7 +68,7 @@ class TestAxelFD(unittest.TestCase): ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE)) self.assertEqual( downloader._make_cmd('test', TEST_INFO), - ['axel', '-o', 'test', 'Cookie: test=ytdlp', '--max-redirect=0', '--', 'http://www.example.com/']) + ['axel', '-o', 'test', '-H', 'Cookie: test=ytdlp', '--max-redirect=0', '--', 'http://www.example.com/']) class TestWgetFD(unittest.TestCase): @@ -85,10 +85,11 @@ class TestCurlFD(unittest.TestCase): def test_make_cmd(self): with FakeYDL() as ydl: downloader = CurlFD(ydl, {}) - self.assertNotIn('--cookie-jar', downloader._make_cmd('test', TEST_INFO)) - # Test cookiejar tempfile arg is added + self.assertNotIn('--cookie', downloader._make_cmd('test', TEST_INFO)) + # Test cookie header is added ydl.cookiejar.set_cookie(http.cookiejar.Cookie(**TEST_COOKIE)) - self.assertIn('--cookie-jar', downloader._make_cmd('test', TEST_INFO)) + self.assertIn('--cookie', downloader._make_cmd('test', TEST_INFO)) + self.assertIn('test=ytdlp', downloader._make_cmd('test', TEST_INFO)) class TestAria2cFD(unittest.TestCase): -- cgit v1.2.3