Issue 5383 - Add tests for the Chrome and Firefox packagers

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 26 matching lines @@
     return result
 
 
 def processFile(path, data, params):
     # We don't change anything yet, this function currently only exists here so
     # that it can be overridden if necessary.
     return data
 
 
 def makeIcons(files, filenames):
-    try:
-        from PIL import Image
-    except ImportError:
-        import Image
     icons = {}
     for filename in filenames:
-        width, height = Image.open(StringIO(files[filename])).size
+        try:
+            magic, width, height = struct.unpack_from('>8s8xii',
+                                                      files[filename])
+        except struct.error:
+            magic = None
+        if magic != '\x89PNG\r\n\x1a\n':
+            raise Exception(filename + ' is no valid PNG.')
         if(width != height):
             print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (filename, width, height)
         icons[width] = filename
     return icons
 
 
 def createScriptPage(params, template_name, script_option):
     template = getTemplate(template_name, autoEscape=True)
     return template.render(
         basename=params['metadata'].get('general', 'basename'),
@@ skipping 304 matching lines @@
                 params, 'testIndex.html.tmpl', ('general', 'testScripts')
             )
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)