projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 't0mm0-hitbox'
[youtube-dl]
/
test
/
test_download.py
diff --git
a/test/test_download.py
b/test/test_download.py
index b2615f338cf228b1165c4c131e27f70b7ab018c3..412f3dbce8683766ba53061fb2aecee95339b829 100644
(file)
--- a/
test/test_download.py
+++ b/
test/test_download.py
@@
-97,7
+97,7
@@
def generator(test_case):
return
for other_ie in other_ies:
if not other_ie.working():
return
for other_ie in other_ies:
if not other_ie.working():
- print_skipping(
u
'test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
+ print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
return
params = get_params(test_case.get('params', {}))
return
params = get_params(test_case.get('params', {}))
@@
-143,7
+143,7
@@
def generator(test_case):
raise
if try_num == RETRIES:
raise
if try_num == RETRIES:
- report_warning(
u
'Failed due to network errors, skipping...')
+ report_warning('Failed due to network errors, skipping...')
return
print('Retrying: {0} failed tries\n\n##########\n\n'.format(try_num))
return
print('Retrying: {0} failed tries\n\n##########\n\n'.format(try_num))
@@
-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'):