From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sun, 9 Jun 2013 13:03:54 +0000 (+0200)
Subject: switch long info_dict fields checking to md5
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ee55fcbe121baa0dacc9f87b9aa3abd974291355;p=youtube-dl

switch long info_dict fields checking to md5
---

diff --git a/test/test_download.py b/test/test_download.py
index 862152033..577bcdbf2 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -38,8 +38,7 @@ def _try_rm(filename):
         if ose.errno != errno.ENOENT:
             raise
 
-def crc32(value):
-    return '%08x' % (binascii.crc32(value.encode('utf8')) & 0xffffffff)
+md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
 
 class FileDownloader(youtube_dl.FileDownloader):
     def __init__(self, *args, **kwargs):
@@ -127,13 +126,13 @@ def generator(test_case):
                 with io.open(tc['file'] + '.info.json', encoding='utf-8') as infof:
                     info_dict = json.load(infof)
                 for (info_field, value) in tc.get('info_dict', {}).items():
-                    if isinstance(value, compat_str) and value.startswith('crc32:'):
-                        self.assertEqual(value, 'crc32:' + crc32(info_dict.get(info_field)))
+                    if isinstance(value, compat_str) and value.startswith('md5:'):
+                        self.assertEqual(value, 'md5:' + md5(info_dict.get(info_field)))
                     else:
                         self.assertEqual(value, info_dict.get(info_field))
 
                 # If checkable fields are missing from the test case, print the info_dict
-                test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'crc32:' + crc32(value))
+                test_info_dict = dict((key, value if not isinstance(value, compat_str) or len(value) < 250 else 'md5:' + md5(value))
                     for key, value in info_dict.items()
                     if value and key in ('title', 'description', 'uploader', 'upload_date', 'uploader_id', 'location'))
                 if not all(key in tc.get('info_dict', {}).keys() for key in test_info_dict.keys()):
diff --git a/test/tests.json b/test/tests.json
index e9abb0950..8a3e8e8e1 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -29,7 +29,7 @@
     "info_dict": {
       "upload_date": "20090102",
       "title": "The Electric Company | \"Short I\" | PBS KIDS GO!",
-      "description": "crc32:5ef3bc57",
+      "description": "md5:2439a8ef6d5a70e380c22f5ad323e5a8",
       "uploader": "PBS",
       "uploader_id": "PBS"
     }
@@ -41,7 +41,7 @@
     "file":  "5779306.m4v",
     "info_dict": {
       "upload_date": "20111205",
-      "description": "crc32:fa658d49",
+      "description": "md5:9bc31f227219cde65e47eeec8d2dc596",
       "uploader": "Comic Book Resources - CBR TV",
       "title": "CBR EXCLUSIVE: \"Gotham City Imposters\" Bats VS Jokerz Short 3"
     }