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
 import struct
 import subprocess
 import sys
+import random
 
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,
                       getTemplate, Files)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
@@ skipping 164 matching lines @@
             'bundle_name': bundle_file,
             'entry_points': entry_files,
         })
 
     cmd = ['node', os.path.join(os.path.dirname(__file__), 'webpack_runner.js')]
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                stdin=subprocess.PIPE)
     output = process.communicate(input=toJson(configuration))[0]
     if process.returncode != 0:
         raise subprocess.CalledProcessError(process.returncode, cmd=cmd)
-
-    bundles = json.loads(output)
-    for bundle in bundles:
-        files[bundle[1:]] = bundles[bundle].encode('utf-8')
+    output = json.loads(output)
+
+    # Clear the mapping for any files included in a bundle, to avoid them being
+    # duplicated in the build.
+    for to_ignore in output['included']:
+        files.pop(to_ignore, None)
+
+    for bundle in output['files']:
+        files[bundle] = output['files'][bundle].encode('utf-8')
 
 
 def import_locales(params, files):
     for item in params['metadata'].items('import_locales'):
         filename, keys = item
         for sourceFile in glob.glob(os.path.join(os.path.dirname(item.source),
                                                  *filename.split('/'))):
             locale = sourceFile.split(os.path.sep)[-2]
             targetFile = os.path.join('_locales', locale, 'messages.json')
             data = json.loads(files.get(targetFile, '{}').decode('utf-8'))
@@ skipping 96 matching lines @@
         file = open(outputFile, 'wb')
     else:
         file = outputFile
     if pubkey != None and signature != None:
         file.write(struct.pack('<4sIII', 'Cr24', 2, len(pubkey), len(signature)))
         file.write(pubkey)
         file.write(signature)
     file.write(zipdata)
 
 
+def add_devenv_requirements(files, metadata, params):
+    files.read(
+        os.path.join(os.path.dirname(__file__), 'chromeDevenvPoller__.js'),
+        relpath='devenvPoller__.js',
+    )
+    files['devenvVersion__'] = str(random.random())
+
+    if metadata.has_option('general', 'testScripts'):
+        files['qunit/index.html'] = createScriptPage(
+            params, 'testIndex.html.tmpl', ('general', 'testScripts')
+        )
+
+
 def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
     metadata = readMetadata(baseDir, type)
     version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
     if outFile == None:
         if type == 'gecko':
             file_extension = 'xpi'
         else:
             file_extension = 'crx' if keyFile else 'zip'
         outFile = getDefaultFileName(metadata, version, file_extension)
@@ skipping 24 matching lines @@
         )
 
     if metadata.has_section('import_locales'):
         import_locales(params, files)
 
     files['manifest.json'] = createManifest(params, files)
     if type == 'chrome':
         fix_translations_for_chrome(files)
 
     if devenv:
-        import buildtools
-        import random
-        files.read(os.path.join(buildtools.__path__[0], 'chromeDevenvPoller__.js'), relpath='devenvPoller__.js')
-        files['devenvVersion__'] = str(random.random())
-
-        if metadata.has_option('general', 'testScripts'):
-            files['qunit/index.html'] = createScriptPage(
-                params, 'testIndex.html.tmpl', ('general', 'testScripts')
-            )
+        add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)