projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6554708
)
[test_utils] Fix tests under Windows
author
Sergey M․
<dstftw@gmail.com>
Wed, 5 Jul 2017 17:25:37 +0000
(
00:25
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 5 Jul 2017 17:25:37 +0000
(
00:25
+0700)
test/test_utils.py
patch
|
blob
|
history
diff --git
a/test/test_utils.py
b/test/test_utils.py
index 30738e7cf4e84ad32f895f21eb59dace2f717b7e..7803e5bc74663371620bf12ac09656c0fbbdaf96 100644
(file)
--- a/
test/test_utils.py
+++ b/
test/test_utils.py
@@
-98,6
+98,7
@@
from youtube_dl.compat import (
compat_chr,
compat_etree_fromstring,
compat_getenv,
compat_chr,
compat_etree_fromstring,
compat_getenv,
+ compat_os_name,
compat_setenv,
compat_urlparse,
compat_parse_qs,
compat_setenv,
compat_urlparse,
compat_parse_qs,
@@
-448,7
+449,9
@@
class TestUtil(unittest.TestCase):
def test_shell_quote(self):
args = ['ffmpeg', '-i', encodeFilename('ñ€ß\'.mp4')]
def test_shell_quote(self):
args = ['ffmpeg', '-i', encodeFilename('ñ€ß\'.mp4')]
- self.assertEqual(shell_quote(args), """ffmpeg -i 'ñ€ß'"'"'.mp4'""")
+ self.assertEqual(
+ shell_quote(args),
+ """ffmpeg -i 'ñ€ß'"'"'.mp4'""" if compat_os_name != 'nt' else '''ffmpeg -i "ñ€ß'.mp4"''')
def test_str_to_int(self):
self.assertEqual(str_to_int('123,456'), 123456)
def test_str_to_int(self):
self.assertEqual(str_to_int('123,456'), 123456)
@@
-932,7
+935,7
@@
class TestUtil(unittest.TestCase):
def test_args_to_str(self):
self.assertEqual(
args_to_str(['foo', 'ba/r', '-baz', '2 be', '']),
def test_args_to_str(self):
self.assertEqual(
args_to_str(['foo', 'ba/r', '-baz', '2 be', '']),
- 'foo ba/r -baz \'2 be\' \'\''
+ 'foo ba/r -baz \'2 be\' \'\''
if compat_os_name != 'nt' else 'foo ba/r -baz "2 be" ""'
)
def test_parse_filesize(self):
)
def test_parse_filesize(self):