X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_utils.py;h=e9e590e749f131a0950c79bcf4fee1e9fb9004c2;hb=3f8ced5144a76a3f9ab7ee8cd06cc79bb75dc564;hp=f2c03d42149b3cacac4af11ea16df6cd45c6e4d0;hpb=06723d47c4f934542a626569045e489a09796975;p=youtube-dl

diff --git a/test/test_utils.py b/test/test_utils.py
index f2c03d421..e9e590e74 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
+# coding: utf-8
 
-# Various small unit tests
-
+# Allow direct execution
+import os
 import sys
 import unittest
-import xml.etree.ElementTree
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-# Allow direct execution
-import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+# Various small unit tests
+import xml.etree.ElementTree
 
 #from youtube_dl.utils import htmlentity_transform
 from youtube_dl.utils import (
@@ -21,6 +22,10 @@ from youtube_dl.utils import (
     find_xpath_attr,
     get_meta_content,
     xpath_with_ns,
+    smuggle_url,
+    unsmuggle_url,
+    shell_quote,
+    encodeFilename,
 )
 
 if sys.version_info < (3, 0):
@@ -155,5 +160,22 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(find('media:song/media:author').text, u'The Author')
         self.assertEqual(find('media:song/url').text, u'http://server.com/download.mp3')
 
+    def test_smuggle_url(self):
+        data = {u"ö": u"ö", u"abc": [3]}
+        url = 'https://foo.bar/baz?x=y#a'
+        smug_url = smuggle_url(url, data)
+        unsmug_url, unsmug_data = unsmuggle_url(smug_url)
+        self.assertEqual(url, unsmug_url)
+        self.assertEqual(data, unsmug_data)
+
+        res_url, res_data = unsmuggle_url(url)
+        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()