projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Recognize Indian censorship (#5021)
[youtube-dl]
/
test
/
test_download.py
diff --git
a/test/test_download.py
b/test/test_download.py
index a009aa475442ae588405a99f432af6feade92836..6a149ae4f707e1dc048890b72a4903ccb8a5f785 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
@@
-155,7
+155,7
@@
def generator(test_case):
if is_playlist:
self.assertEqual(res_dict['_type'], 'playlist')
self.assertTrue('entries' in res_dict)
if is_playlist:
self.assertEqual(res_dict['_type'], 'playlist')
self.assertTrue('entries' in res_dict)
- expect_info_dict(self,
test_case.get('info_dict', {}), res_dict
)
+ expect_info_dict(self,
res_dict, test_case.get('info_dict', {})
)
if 'playlist_mincount' in test_case:
assertGreaterEqual(
if 'playlist_mincount' in test_case:
assertGreaterEqual(
@@
-204,7
+204,7
@@
def generator(test_case):
with io.open(info_json_fn, encoding='utf-8') as infof:
info_dict = json.load(infof)
with io.open(info_json_fn, encoding='utf-8') as infof:
info_dict = json.load(infof)
- expect_info_dict(self,
tc.get('info_dict', {}), info_dict
)
+ expect_info_dict(self,
info_dict, tc.get('info_dict', {})
)
finally:
try_rm_tcs_files()
if is_playlist and res_dict is not None and res_dict.get('entries'):
finally:
try_rm_tcs_files()
if is_playlist and res_dict is not None and res_dict.get('entries'):