Issue 5383 - Add tests for the Chrome and Firefox packagers

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 os
+import xml.etree.ElementTree as ET
+
 import pytest
 
-import xml.etree.ElementTree as ET
-
-from buildtools.tests.tools import (ZipContent, run_webext_build, locale_files,
-                                    copy_metadata, assert_manifest_content,
-                                    assert_all_locales_present)
-from buildtools.tests.conftest import ALL_LANGUAGES
 from buildtools import packager, packagerEdge
-
-
-@pytest.fixture
-def locale_files_edge(tmpdir):
-    return locale_files(ALL_LANGUAGES, '_locales', tmpdir)
-
-
-@pytest.fixture
-def edge_metadata(tmpdir):
-    filename = 'metadata.edge'
-    copy_metadata(filename, tmpdir)
-
-    return packager.readMetadata(str(tmpdir), 'edge')
 
 
 @pytest.fixture
 def files():
     """Minimal Files() for testing blockmap."""
     str500 = b''.join(chr(i % 200 + 30) for i in range(500))
     files = packager.Files(set(), set())
     files['Extension/foo.xml'] = str500
     files['Extension/bar.png'] = str500 * 200
     return files
-
-
-@pytest.fixture
-def js_extensions(srcdir):
-    srcdir.mkdir('ext').join('foo.js').write('var foo;')
-    srcdir.join('bar.js').write('var bar;')
 
 
 def blockmap2dict(xml_data):
     """Convert AppxBlockMap.xml to a dict of dicts easier to inspect."""
     return {
         file.get('Name'): {
             'size': file.get('Size'),
             'lfhsize': file.get('LfhSize'),
             'blocks': [b.get('Hash') for b in file]
         }
@@ skipping 48 matching lines @@
         'js': 'application/javascript',
         'json': 'application/json',
         'otf': 'application/octet-stream',
         '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'
     }
-
-
-@pytest.mark.usefixtures('locale_files_edge', 'js_extensions')
-@pytest.mark.parametrize('dev_build_release,buildnum', [
-    pytest.param('devenv', None, marks=pytest.mark.xfail),
-    ('release', None),
-    ('build', '1337'),
-])
-def test_build_edge(dev_build_release, tmpdir, srcdir, edge_metadata,
-                    buildnum):
-    release = dev_build_release == 'release'
-
-    run_webext_build('edge', dev_build_release, srcdir, buildnum=buildnum)
-
-    if release:
-        out_file = 'adblockplusedge-1.2.3.appx'
-    else:
-        out_file = 'adblockplusedge-1.2.3.{}.appx'.format(buildnum)
-
-    with ZipContent(out_file) as package:
-        filenames = set(package.namelist())
-
-        assert_all_locales_present(package, 'Extension/_locales')
-
-        assert 'AppxManifest.xml' in filenames
-        assert 'AppxBlockMap.xml' in filenames
-        assert '[Content_Types].xml' in filenames
-
-        assert 'Extension/ext/foo.js' in filenames
-        assert 'Extension/bar.js' in filenames
-
-        assert package.read('Assets/logo_44.png') == '44'
-        assert package.read('Extension/icons/abp-44.png') == '44'
-
-        filename = '{{}}_edge_{}_{}.{{}}'.format(release, buildnum)

[Sebastian Noack, 2017/09/21 19:09:04]

The buildnum is redundant here. The filenames are still distinct if you remove
that part.

[Sebastian Noack, 2017/09/22 01:56:05]

Also it is inconsistent with "edge" and "gecko-webext", where you use "build"
and "release", while here it is "True"/"False" which is much less descriptive.

[tlucas, 2017/09/22 09:02:18]

Done.

-
-        for folder, name, ext in [('', 'AppxManifest', 'xml'),
-                                  ('Extension', 'manifest', 'json')]:
-            expected = os.path.join(
-                os.path.dirname(__file__),
-                'expecteddata',
-                filename.format(name, ext),
-            )
-
-            assert_manifest_content(
-                package.read(os.path.join(folder, '{}.{}'.format(name, ext))),
-                expected,
-            )