Merge pull request mozilla#797 from notmasteryet/tree-41

arturadib · arturadib · commit beb310708da0 · 2011-11-18T10:55:09.000-08:00
Warn (not fail) during MD5 verification, new MD5 for intelisa and f1040
diff --git a/test/test.py b/test/test.py
@@ -323,18 +323,18 @@ def verifyPDFs(manifestList):
         if os.access(f, os.R_OK):
             fileMd5 = hashlib.md5(open(f, 'rb').read()).hexdigest()
             if 'md5' not in item:
-                print 'ERROR: Missing md5 for file "' + f + '".',
+                print 'WARNING: Missing md5 for file "' + f + '".',
                 print 'Hash for current file is "' + fileMd5 + '"'
                 error = True
                 continue
             md5 = item['md5']
             if fileMd5 != md5:
-                print 'ERROR: MD5 of file "' + f + '" does not match file.',
+                print 'WARNING: MD5 of file "' + f + '" does not match file.',
                 print 'Expected "' + md5 + '" computed "' + fileMd5 + '"'
                 error = True
                 continue
         else:
-            print 'ERROR: Unable to open file for reading "' + f + '".'
+            print 'WARNING: Unable to open file for reading "' + f + '".'
             error = True
     return not error
 
@@ -365,7 +365,8 @@ def setUp(options):
     downloadLinkedPDFs(manifestList)
 
     if not verifyPDFs(manifestList):
-        raise Exception('ERROR: failed to verify pdfs.')
+      print 'Unable to verify the checksum for the files that are used for testing.'
+      print 'Please re-download the files, or adjust the MD5 checksum in the manifest for the files listed above.\n'
 
     for b in testBrowsers:
         State.taskResults[b.name] = { }
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -19,7 +19,7 @@
     },
     {  "id": "intelisa-load",
        "file": "pdfs/intelisa.pdf",
-       "md5": "f3ed5487d1afa34d8b77c0c734a95c79",
+       "md5": "f5712097d29287a97f1278839814f682",
        "link": true,
        "rounds": 1,
        "type": "load"
@@ -194,7 +194,7 @@
     },
     {  "id": "f1040",
        "file": "pdfs/f1040.pdf",
-       "md5": "7323b50c6d28d959b8b4b92c469b2469",
+       "md5": "b59272ce19b4a0c5808c8861441b0741",
        "link": true,
        "rounds": 1,
        "type": "load"
