projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ceskatelevizesrt' of https://github.com/oskar456/youtube-dl into oskar4...
[youtube-dl]
/
test
/
test_YoutubeDL.py
diff --git
a/test/test_YoutubeDL.py
b/test/test_YoutubeDL.py
index 8735013f7278a27814dc8210482ea04dd1830d21..730f7ec260e9c4f1ef53273d67fc2d52f68e78b1 100644
(file)
--- a/
test/test_YoutubeDL.py
+++ b/
test/test_YoutubeDL.py
@@
-67,7
+67,7
@@
class TestFormatSelection(unittest.TestCase):
downloaded = ydl.downloaded_info_dicts[0]
self.assertEqual(downloaded['ext'], 'mp4')
downloaded = ydl.downloaded_info_dicts[0]
self.assertEqual(downloaded['ext'], 'mp4')
- # No prefer_free_formats => prefer mp4 and flv for greater compatibilty
+ # No prefer_free_formats => prefer mp4 and flv for greater compatibil
i
ty
ydl = YDL()
ydl.params['prefer_free_formats'] = False
formats = [
ydl = YDL()
ydl.params['prefer_free_formats'] = False
formats = [
@@
-218,10
+218,10
@@
class TestFormatSelection(unittest.TestCase):
# 3D
'85', '84', '102', '83', '101', '82', '100',
# Dash video
# 3D
'85', '84', '102', '83', '101', '82', '100',
# Dash video
- '13
8', '13
7', '248', '136', '247', '135', '246',
+ '137', '248', '136', '247', '135', '246',
'245', '244', '134', '243', '133', '242', '160',
# Dash audio
'245', '244', '134', '243', '133', '242', '160',
# Dash audio
- '141', '172', '140', '1
39', '171
',
+ '141', '172', '140', '1
71', '139
',
]
for f1id, f2id in zip(order, order[1:]):
]
for f1id, f2id in zip(order, order[1:]):
@@
-266,6
+266,7
@@
class TestFormatSelection(unittest.TestCase):
'ext': 'mp4',
'width': None,
}
'ext': 'mp4',
'width': None,
}
+
def fname(templ):
ydl = YoutubeDL({'outtmpl': templ})
return ydl.prepare_filename(info)
def fname(templ):
ydl = YoutubeDL({'outtmpl': templ})
return ydl.prepare_filename(info)
@@
-279,7
+280,7
@@
class TestFormatSelection(unittest.TestCase):
self.assertEqual(ydl._format_note({}), '')
assertRegexpMatches(self, ydl._format_note({
'vbr': 10,
self.assertEqual(ydl._format_note({}), '')
assertRegexpMatches(self, ydl._format_note({
'vbr': 10,
- }), '^
x
\s*10k$')
+ }), '^\s*10k$')
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()