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 pytest
 
 import xml.etree.ElementTree as ET
 
-from buildtools.tests.tools import run_webext_build

[Vasily Kuznetsov, 2017/09/11 12:50:06]

You can combine all the imports from `buildtools.tests.tools` like this:

    from buildtools.tests.tools import (run_webext_build, locale_files,
                                        copy_metadata, ...)

or like this:

    from buildtools.tests.tools import (
        run_webext_build,
        locale_files,
        copy_metadata,
        ...
    )

The first one is more compact and less cluttered, the second one is even more
readable -- choose your favorite :)

[tlucas, 2017/09/12 11:32:10]

Acknowledged.

[tlucas, 2017/09/13 13:43:24]

Done.

-from buildtools.tests.tools import locale_files
-from buildtools.tests.tools import copy_metadata
-from buildtools.tests.tools import ZipContent
-from buildtools.tests.tools import assert_manifest_content
-from buildtools.tests.tools import assert_all_locales_present
+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
-from buildtools import packagerEdge
+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'
@@ skipping 81 matching lines @@
         '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('build_release', ['release', 'build'])
-def test_build_edge(build_release, tmpdir, srcdir, edge_metadata):
-    from buildtools import packagerEdge
+@pytest.mark.parametrize('buildnum', [None, '1337'])
+def test_build_edge(build_release, tmpdir, srcdir, edge_metadata, buildnum):
     release = build_release == 'release'
 
-    run_webext_build('edge', build_release, srcdir, packagerEdge)
+    run_webext_build('edge', build_release, srcdir, packagerEdge,
+                     buildnum=buildnum)
 
     if release:
         out_file = 'adblockplusedge-1.2.3.appx'
     else:
-        out_file = 'adblockplusedge-1.2.3.0.appx'
+        out_file = 'adblockplusedge-1.2.3.{}.appx'.format(
+            buildnum or '0'
+        )
 
     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'
 
-        if release:
-            filename = 'manifest_edge_True.xml'
-        else:
-            filename = 'manifest_edge_False.xml'
+        filename = 'manifest_edge_{}_{}.xml'.format(release, buildnum)
 
         expected = os.path.join(
             os.path.dirname(__file__),
             'expecteddata',
             filename,
         )
         assert_manifest_content(package.read('AppxManifest.xml'), expected)