From ad3dc496bbf2e2a574a16244ddde0740778e5daf Mon Sep 17 00:00:00 2001 From: pukkandan Date: Mon, 9 Aug 2021 17:40:24 +0530 Subject: Misc fixes - See desc * Remove unnecessary uses of _list_from_options_callback * Fix download tests - Bug from 6e84b21559f586ee4d6affb61688d5c6a0c21221 * Rename ExecAfterDownloadPP to ExecPP and refactor its tests * Ensure _write_ytdl_file closes file handle on error - Potential fix for #517 --- test/test_postprocessors.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/test_postprocessors.py') diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py index 320e69e88..b15cbd28c 100644 --- a/test/test_postprocessors.py +++ b/test/test_postprocessors.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from yt_dlp import YoutubeDL from yt_dlp.compat import compat_shlex_quote from yt_dlp.postprocessor import ( - ExecAfterDownloadPP, + ExecPP, FFmpegThumbnailsConvertorPP, MetadataFromFieldPP, MetadataParserPP, @@ -59,12 +59,12 @@ class TestConvertThumbnail(unittest.TestCase): os.remove(file.format(out)) -class TestExecAfterDownload(unittest.TestCase): +class TestExec(unittest.TestCase): def test_parse_cmd(self): - pp = ExecAfterDownloadPP(YoutubeDL(), '') + pp = ExecPP(YoutubeDL(), '') info = {'filepath': 'file name'} - quoted_filepath = compat_shlex_quote(info['filepath']) + cmd = 'echo %s' % compat_shlex_quote(info['filepath']) - self.assertEqual(pp.parse_cmd('echo', info), 'echo %s' % quoted_filepath) - self.assertEqual(pp.parse_cmd('echo.{}', info), 'echo.%s' % quoted_filepath) - self.assertEqual(pp.parse_cmd('echo "%(filepath)s"', info), 'echo "%s"' % info['filepath']) + self.assertEqual(pp.parse_cmd('echo', info), cmd) + self.assertEqual(pp.parse_cmd('echo {}', info), cmd) + self.assertEqual(pp.parse_cmd('echo %(filepath)q', info), cmd) -- cgit v1.2.3