diff options
| author | dirkf <fieldhouse@gmx.net> | 2023-07-17 20:47:58 +0100 | 
|---|---|---|
| committer | dirkf <fieldhouse@gmx.net> | 2023-07-18 10:50:46 +0100 | 
| commit | 1720c04dc56fa0d2caa0a455b1acbd569347482e (patch) | |
| tree | 8ea0c21a70347c6abf67e70abe5828e869cf4f53 | |
| parent | d5ef405c5d533c85cebd205a5b7958614c7013f3 (diff) | |
[test] Make skipped tests in test_execution work with Py 2.6
| -rw-r--r-- | test/test_execution.py | 11 | 
1 files changed, 7 insertions, 4 deletions
| diff --git a/test/test_execution.py b/test/test_execution.py index 35e7a5651..ae59e562a 100644 --- a/test/test_execution.py +++ b/test/test_execution.py @@ -24,21 +24,24 @@ except AttributeError:  class TestExecution(unittest.TestCase): +    def setUp(self): +        self.module = 'youtube_dl' +        if sys.version_info < (2, 7): +            self.module += '.__main__' +      def test_import(self):          subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir) -    @unittest.skipIf(sys.version_info < (2, 7), 'Python 2.6 doesn\'t support package execution')      def test_module_exec(self): -        subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL) +        subprocess.check_call([sys.executable, '-m', self.module, '--version'], cwd=rootDir, stdout=_DEV_NULL)      def test_main_exec(self):          subprocess.check_call([sys.executable, os.path.normpath('youtube_dl/__main__.py'), '--version'], cwd=rootDir, stdout=_DEV_NULL) -    @unittest.skipIf(sys.version_info < (2, 7), 'Python 2.6 doesn\'t support package execution')      def test_cmdline_umlauts(self):          os.environ['PYTHONIOENCODING'] = 'utf-8'          p = subprocess.Popen( -            [sys.executable, os.path.normpath('youtube_dl/__main__.py'), encodeArgument('ä'), '--version'], +            [sys.executable, '-m', self.module, encodeArgument('ä'), '--version'],              cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)          _, stderr = p.communicate()          self.assertFalse(stderr) | 
