Issue 4028 - Add support for Edge extensions to buildtools

tests/test_packagerEdge.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 ConfigParser
 import json
 import os
 import shutil
 import xml.etree.ElementTree as ET
 import zipfile
 
 import pytest
 
 from buildtools import packager, packagerEdge
 
 TEST_DIR = os.path.dirname(__file__)
 TEST_METADATA = os.path.join(TEST_DIR, 'metadata.edge')
 CHARS = b''.join(chr(i % 200 + 30) for i in range(500))
 MESSAGES_EN_US = json.dumps({
-    'name': 'Adblock Plus',
-    'description': 'Adblock Plus is the most popular ad blocker ever, '
+    'name': {'message': 'Adblock Plus'},
+    'name_devbuild': {'message': 'devbuild-marker'},
+    'description': {
+        'message': 'Adblock Plus is the most popular ad blocker ever, '
                    'and also supports websites by not blocking '
                    'unobstrusive ads by default (configurable).'
+    },
 })
 
 
 @pytest.fixture
 def metadata():
     """Loaded metadata config."""
     conf_parser = ConfigParser.ConfigParser()
     conf_parser.read(TEST_METADATA)
     return conf_parser
 
@@ skipping 86 matching lines @@
         'png': 'image/png',
         'xml': 'application/xml'
     }
     assert ctm_dict['overrides'] == {
         '/AppxBlockMap.xml': 'application/vnd.ms-appx.blockmap+xml',
         '/AppxManifest.xml': 'application/vnd.ms-appx.manifest+xml'
     }
 
 
 def test_create_appx_manifest(metadata, files):
-    manifest = packagerEdge.create_appx_manifest({'metadata': metadata}, files)
+    manifest = packagerEdge.create_appx_manifest(
+        {'metadata': metadata}, files, release_build=True,
+    )
     with open(os.path.join(TEST_DIR, 'AppManifest.xml.expect')) as fp:
         manifest_expect = fp.read()
     assert manifest.strip() == manifest_expect.strip()
 
 
-def test_warn_about_inconsistent_id(mocker, metadata, files):
-    """Test AppxManifest creation when app_id doesn't match name and author."""
-    metadata.set('general', 'app_id', 'foo.bar')
-    mocked_stderr = mocker.patch('sys.stderr')
-    packagerEdge.create_appx_manifest({'metadata': metadata}, files)
-    assert mocked_stderr.write.called
-    msg = mocked_stderr.write.call_args[0][0]
-    assert msg.startswith('WARNING')
+def test_create_devbuild_appx_manifest(metadata, files):
+    manifest = packagerEdge.create_appx_manifest(
+        {'metadata': metadata}, files, release_build=False,
+    )
+    assert 'devbuild-marker' in manifest
 
 
 def test_move_files_to_extension():
     files = packager.Files(set(), set())
     files['foo.xml'] = CHARS
     files['foo/bar.xml'] = CHARS
     files['Extension/foo.xml'] = CHARS
     packagerEdge.move_files_to_extension(files)
     assert set(files.keys()) == {
         'Extension/foo.xml',
         'Extension/foo/bar.xml',
         'Extension/Extension/foo.xml'
     }
 
 
 def test_create_build(tmpdir, srcdir):
     out_file = str(tmpdir.join('abp.appx'))
-    packagerEdge.createBuild(str(srcdir), outFile=out_file)
+    packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=True)
     appx = zipfile.ZipFile(out_file)
 
     names = set(appx.namelist())
     assert 'AppxManifest.xml' in names
     assert 'AppxBlockMap.xml' in names
     assert '[Content_Types].xml' in names
 
+    assert 'devbuild-marker' not in appx.read('AppxManifest.xml')
     assert appx.read('Assets/logo_44.png') == '44'
     assert appx.read('Extension/icons/abp-44.png') == '44'
+
+
+def test_create_devbuild(tmpdir, srcdir):
+    out_file = str(tmpdir.join('abp.appx'))
+    packagerEdge.createBuild(str(srcdir), outFile=out_file, releaseBuild=False)
+    appx = zipfile.ZipFile(out_file)
+    assert 'devbuild-marker' in appx.read('AppxManifest.xml')