projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vgtv] Fix _VALID_URL (Closes #5578)
[youtube-dl]
/
test
/
test_download.py
diff --git
a/test/test_download.py
b/test/test_download.py
index 412f3dbce8683766ba53061fb2aecee95339b829..1110357a7e8097eb38479d2a15837516af32a726 100644
(file)
--- a/
test/test_download.py
+++ b/
test/test_download.py
@@
-89,7
+89,7
@@
def generator(test_case):
for tc in test_cases:
info_dict = tc.get('info_dict', {})
for tc in test_cases:
info_dict = tc.get('info_dict', {})
- if not
tc.get('file') and not
(info_dict.get('id') and info_dict.get('ext')):
+ if not (info_dict.get('id') and info_dict.get('ext')):
raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
if 'skip' in test_case:
raise Exception('Test definition incorrect. The output file cannot be known. Are both \'id\' and \'ext\' keys present?')
if 'skip' in test_case:
@@
-116,7
+116,7
@@
def generator(test_case):
expect_warnings(ydl, test_case.get('expected_warnings', []))
def get_tc_filename(tc):
expect_warnings(ydl, test_case.get('expected_warnings', []))
def get_tc_filename(tc):
- return
tc.get('file') or
ydl.prepare_filename(tc.get('info_dict', {}))
+ return ydl.prepare_filename(tc.get('info_dict', {}))
res_dict = None
res_dict = None
@@
-153,7
+153,7
@@
def generator(test_case):
break
if is_playlist:
break
if is_playlist:
- self.assert
Equal(res_dict['_type'], 'playlist'
)
+ self.assert
True(res_dict['_type'] in ['playlist', 'multi_video']
)
self.assertTrue('entries' in res_dict)
expect_info_dict(self, res_dict, test_case.get('info_dict', {}))
self.assertTrue('entries' in res_dict)
expect_info_dict(self, res_dict, test_case.get('info_dict', {}))