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 io
 import json
 import os
 import re
 from StringIO import StringIO
@@ skipping 25 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
+        width, height = struct.unpack('>ii', files[filename][16:24])

[Sebastian Noack, 2017/09/13 19:18:29]

I wonder whether it would be worth to check for the magic number (i.e.
'\x89PNG\r\n\x1a\n'), in order to fail, in case it is not a PNG file?

[tlucas, 2017/09/14 09:39:53]

Do we strictly require the icons to be pngs? If yes it would make sense, if not
we might want to consider reintroducing Pillow / PIL.

[Sebastian Noack, 2017/09/14 16:51:59]

We only use PNG. But technically, some other formats are possible as well,
though it's not clear which (other than PNG) are supported across all browsers,
and PNG is preferable over the other formats supported by Chrome, anyway.

However, in case somebody would (accidentally) use an icon in another format,
"width" and "height" would be completely arbitrary here, and it might be better
to have the build fail instead in that case.

         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 353 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)