From 55488dcbfcaed01f194e993330d0b4bb3ba85135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Wed, 5 Nov 2014 16:42:02 +0100 Subject: [PATCH 1/2] [test_download] Allow lists for md5 check --- test/test_download.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test_download.py b/test/test_download.py index 87aced97c..50f8778ee 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -185,7 +185,10 @@ def generator(test_case): format_bytes(got_fsize))) if 'md5' in tc: md5_for_file = _file_md5(tc_filename) - self.assertEqual(md5_for_file, tc['md5']) + if isinstance(tc['md5'], str): + self.assertEqual(md5_for_file, tc['md5']) + else: + self.assertTrue(md5_for_file in tc['md5']) info_json_fn = os.path.splitext(tc_filename)[0] + '.info.json' self.assertTrue( os.path.exists(info_json_fn), From 1a1ab231b71f8bae5d0b6ff14d12022401590786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Wed, 5 Nov 2014 16:43:09 +0100 Subject: [PATCH 2/2] [funnyordie] Fix test case md5 --- youtube_dl/extractor/funnyordie.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 487d5d1b4..7b2ce4a79 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -21,7 +21,7 @@ class FunnyOrDieIE(InfoExtractor): }, }, { 'url': 'http://www.funnyordie.com/embed/e402820827', - 'md5': '29f4c5e5a61ca39dfd7e8348a75d0aad', + 'md5': ['29f4c5e5a61ca39dfd7e8348a75d0aad', 'ff4d83318f89776ed0250634cfaa8d36'], 'info_dict': { 'id': 'e402820827', 'ext': 'mp4',