Merge tag 'upstream/2016.08.17'

[youtubedl] / test / test_execution.py

diff --git a/test/test_execution.py b/test/test_execution.py
index 2b115fb31a76fd1de7f6ff90733b4d33dd60d0a9..620db080e9bd836c7239a93e86e0944b95f793e0 100644 (file)
--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -1,26 +1,43 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+from __future__ import unicode_literals
+

 import unittest
 
 import sys
 import os
 import subprocess
 import unittest
 
 import sys
 import os
 import subprocess

+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from youtube_dl.utils import encodeArgument

 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

+

 try:
     _DEV_NULL = subprocess.DEVNULL
 except AttributeError:
     _DEV_NULL = open(os.devnull, 'wb')
 
 try:
     _DEV_NULL = subprocess.DEVNULL
 except AttributeError:
     _DEV_NULL = open(os.devnull, 'wb')
 

+

 class TestExecution(unittest.TestCase):
     def test_import(self):
         subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
     def test_module_exec(self):
 class TestExecution(unittest.TestCase):
     def test_import(self):
         subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
 
     def test_module_exec(self):

-        if sys.version_info >= (2,7): # Python 2.6 doesn't support package execution
+        if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution

             subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
         subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
             subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 
     def test_main_exec(self):
         subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
 

+    def test_cmdline_umlauts(self):
+        p = subprocess.Popen(
+            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
+            cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
+        _, stderr = p.communicate()
+        self.assertFalse(stderr)
+

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