Merge tag 'upstream/2013.12.04'

[youtubedl] / test / test_utils.py

diff --git a/test/test_utils.py b/test/test_utils.py
index f3fbff042ccc8193d8d08527fdc04421c9832305..e9e590e749f131a0950c79bcf4fee1e9fb9004c2 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -24,6 +24,8 @@ from youtube_dl.utils import (
     xpath_with_ns,
     smuggle_url,
     unsmuggle_url,
     xpath_with_ns,
     smuggle_url,
     unsmuggle_url,

+    shell_quote,
+    encodeFilename,

 )
 
 if sys.version_info < (3, 0):
 )
 
 if sys.version_info < (3, 0):


@@ -170,6 +172,10 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(res_url, url)
         self.assertEqual(res_data, None)
 
         self.assertEqual(res_url, url)
         self.assertEqual(res_data, None)
 

+    def test_shell_quote(self):
+        args = ['ffmpeg', '-i', encodeFilename(u'ñ€ß\'.mp4')]
+        self.assertEqual(shell_quote(args), u"""ffmpeg -i 'ñ€ß'"'"'.mp4'""")
+

 
 if __name__ == '__main__':
     unittest.main()
 
 if __name__ == '__main__':
     unittest.main()