aboutsummaryrefslogtreecommitdiff
path: root/test/test_download.py
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-01-01 16:07:26 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-01-01 16:07:26 +0100
commit6535e9511fc18eee2fc640c77fd42a4a39791915 (patch)
tree5228e856ff6682d0ff7f9c79f609119d654c2b89 /test/test_download.py
parent60c7520a51b59b096c84033bcd709b5c4148338e (diff)
In tests.json file and md5 join in a 'files' list to handle multiple-file IEs
Diffstat (limited to 'test/test_download.py')
-rw-r--r--test/test_download.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 1ee1b334d..5b35c37e7 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -54,9 +54,10 @@ class TestDownload(unittest.TestCase):
self.tearDown()
def tearDown(self):
- for fn in [ test.get('file', False) for test in self.defs ]:
- if fn and os.path.exists(fn):
- os.remove(fn)
+ for files in [ test['files'] for test in self.defs ]:
+ for fn, md5 in files:
+ if os.path.exists(fn):
+ os.remove(fn)
### Dinamically generate tests
@@ -67,9 +68,6 @@ 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
@@ -84,10 +82,11 @@ def generator(test_case):
fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')())
fd.download([test_case['url']])
- 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'])
+ 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)
info_dict = fd.processed_info_dicts[0]
for (info_field, value) in test_case.get('info_dict', {}).items():
if value.startswith('md5:'):