Bug 1476661 - Ensure H2 dependencies are packaged alongside wptserve where needed, r=jgraham
authorDavid Heiberg <dheiberg@mozilla.com>
Thu, 26 Jul 2018 10:45:00 +0000
changeset 485919 82dbd237f05a7d0947d77f374917fd7b1db1a6ae
parent 485918 62e63235190bdb064246d7126cb9f61410af138d
child 485920 241cb3078495a2aae68fa4fb129659c04d370176
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1476661
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1476661 - Ensure H2 dependencies are packaged alongside wptserve where needed, r=jgraham MozReview-Commit-ID: 5tbXeHsvNI5
build/virtualenv_packages.txt
python/mozbuild/mozbuild/action/test_archive.py
testing/config/marionette_requirements.txt
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -55,18 +55,23 @@ mozilla.pth:testing/marionette/harness/m
 mozilla.pth:testing/marionette/puppeteer/firefox
 mozilla.pth:testing/raptor
 mozilla.pth:testing/talos
 packages.txt:testing/mozbase/packages.txt
 mozilla.pth:tools
 mozilla.pth:testing/web-platform
 mozilla.pth:testing/web-platform/tests/tools/third_party/html5lib
 mozilla.pth:testing/web-platform/tests/tools/third_party/webencodings
+mozilla.pth:testing/web-platform/tests/tools/third_party/enum
+mozilla.pth:testing/web-platform/tests/tools/third_party/h2
+mozilla.pth:testing/web-platform/tests/tools/third_party/hpack
+mozilla.pth:testing/web-platform/tests/tools/third_party/hyperframe
+mozilla.pth:testing/web-platform/tests/tools/third_party/certifi
+mozilla.pth:testing/web-platform/tests/tools/wptserve
 mozilla.pth:testing/web-platform/tests/tools/wptrunner
-mozilla.pth:testing/web-platform/tests/tools/wptserve
 mozilla.pth:testing/web-platform/tests/tools/six
 mozilla.pth:testing/xpcshell
 mozilla.pth:third_party/python/mock-1.0.0
 mozilla.pth:xpcom/ds/tools
 mozilla.pth:xpcom/typelib/xpt/tools
 mozilla.pth:tools/docs
 mozilla.pth:third_party/python/cbor2
 mozilla.pth:third_party/python/pyasn1
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -217,16 +217,22 @@ ARCHIVE_FILES = {
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing/web-platform/tests/tools/wptserve',
             'pattern': '**',
             'dest': 'tools/wptserve',
         },
         {
             'source': buildconfig.topsrcdir,
+            'base': 'testing/web-platform/tests/tools/third_party',
+            'pattern': '**',
+            'dest': 'tools/wpt_third_party',
+        },
+        {
+            'source': buildconfig.topsrcdir,
             'base': 'python/mozterm',
             'pattern': '**',
             'dest': 'tools/mozterm',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'third_party/python/six',
             'pattern': '**',
--- a/testing/config/marionette_requirements.txt
+++ b/testing/config/marionette_requirements.txt
@@ -1,9 +1,14 @@
 -r mozbase_requirements.txt
 
 ../tools/wptserve
+../tools/wpt_third_party/certifi
+../tools/wpt_third_party/enum
+../tools/wpt_third_party/h2
+../tools/wpt_third_party/hyperframe
+../tools/wpt_third_party/hpack
 ../marionette/client
 ../marionette/harness/marionette_harness/runner/mixins/browsermob-proxy-py
 ../marionette/harness
 
 # Allows to use the Puppeteer page object model for Firefox
 ../marionette/puppeteer/firefox/
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -147,16 +147,17 @@ class FirefoxUITests(TestingMixin, VCSTo
     def download_and_extract(self):
         """Override method from TestingMixin for more specific behavior."""
         extract_dirs = ['config/*',
                         'firefox-ui/*',
                         'marionette/*',
                         'mozbase/*',
                         'tools/mozterm/*',
                         'tools/wptserve/*',
+                        'tools/wpt_third_party/*',
                         'mozpack/*',
                         'mozbuild/*',
                         ]
         super(FirefoxUITests, self).download_and_extract(extract_dirs=extract_dirs)
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs