Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "In tests.json file and md5 join in a 'files' list to handle multiple-file IEs"

Browse source 
This made the JSON structure really unreadable and was a quick fix.

This reverts commit 6535e9511f.
This commit is contained in:
Philipp Hagemeister 2013-01-01 19:07:06 +01:00
parent 911ee27e83
commit 6985325e01
2 changed files with 53 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/test_download.py
View file

@ -54,10 +54,9 @@ class TestDownload(unittest.TestCase):
self.tearDown()
def tearDown(self):
for files in [ test['files'] for test in self.defs ]:
for fn, md5 in files:
if os.path.exists(fn):
os.remove(fn)
for fn in [ test.get('file', False) for test in self.defs ]:
if fn and os.path.exists(fn):
os.remove(fn)
### Dynamically generate tests
@ -68,6 +67,9 @@ def generator(test_case):
if not ie._WORKING:
print('Skipping: IE marked as not _WORKING')
return
if not test_case['file']:
print('Skipping: No output file specified')
return
if 'skip' in test_case:
print('Skipping: {0}'.format(test_case['skip']))
return
@ -82,11 +84,10 @@ def generator(test_case):
fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')())
fd.download([test_case['url']])
for filename, md5 in test_case['files']:
self.assertTrue(os.path.exists(filename))
if md5:
md5_for_file = _file_md5(filename)
self.assertEqual(md5_for_file, md5)
self.assertTrue(os.path.exists(test_case['file']))
if 'md5' in test_case:
md5_for_file = _file_md5(test_case['file'])
self.assertEqual(md5_for_file, test_case['md5'])
info_dict = fd.processed_info_dicts[0]
for (info_field, value) in test_case.get('info_dict', {}).items():
if value.startswith('md5:'):