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
+        magic, width, height = struct.unpack('>8s8xii', files[filename][:24])

[Sebastian Noack, 2017/09/20 21:36:10]

This is different from my suggestion:

1. If you use struct.unpack_from (instead of struct.unpack), trailing bytes are
ignored, so that you don't have to redundantly hard-code the length of the data
strucutre we are going to unpack.

2. You don't catch struct.error. As explained in my previous comment, this will
cause an inconsistent (and less meaningful) exception to be raised if there are
less than 24 bytes of data.

[tlucas, 2017/09/21 11:34:55]

Sorry, i somehow overlooked this part from your comment. Done.

+        if magic != '\x89PNG\r\n\x1a\n':
+            raise TypeError('{} is no valid PNG.'.format(filename))

[Sebastian Noack, 2017/09/20 21:36:10]

Nit; from https://adblockplus.org/coding-style#python:

  Use the + operator when concatenating exactly two strings, ...

[tlucas, 2017/09/21 11:34:55]

Done.

         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)