Bug 1497272 [wpt PR 13425] - Drop the use of the `hosts` addon in Travis, a=testonly
authorGeoffrey Sneddon <me@gsnedders.com>
Thu, 11 Oct 2018 09:31:57 +0000
changeset 489270 dae114307716d9290773130e728b5c5b6d44dad6
parent 489269 12b1a7e060542177700c819ed941820e3d497cfd
child 489271 31a20d731a4041d04f4dd6f0d896b9444634ac1a
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewerstestonly
bugs1497272, 13425
milestone64.0a1
Bug 1497272 [wpt PR 13425] - Drop the use of the `hosts` addon in Travis, a=testonly Automatic update from web-platform-testsAvoid serve/test_functional.py#test_subprocess_exit relying on hosts Without bind_address: False we use the server address for the stash, and this obviously doesn't work without the hosts being set up. -- Drop the use of the `hosts` addon in Travis The hosts list is out of date and this isn't needed, as tools/ci/lib.sh does the hosts fixup when needed. Drive-by: remove a redundant `sudo: required`. -- wpt-commits: a239c7d3842c3b2cdde3cd6049e496d5cc884360, 6f0a96ed650935b17b6e5d277889cfbe0ccc103e wpt-pr: 13425
testing/web-platform/tests/.travis.yml
testing/web-platform/tests/tools/serve/test_functional.py
--- a/testing/web-platform/tests/.travis.yml
+++ b/testing/web-platform/tests/.travis.yml
@@ -1,22 +1,14 @@
 dist: trusty
 sudo: required
 language: python
 branches:
   only:
     - master
-addons:
-  hosts:
-    - web-platform.test
-    - www.web-platform.test
-    - www1.web-platform.test
-    - www2.web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - xn--lve-6lad.web-platform.test
 before_install:
   # This needs be sourced as it sets various env vars
   - . ./tools/ci/before_install.sh
 install:
   - ./tools/ci/install.sh
 matrix:
   # The use of `if` conditionals to exclude jobs from master should align with
   # jobs unconditionally listed by `./wpt test-jobs`, regardless of affected
@@ -59,17 +51,16 @@ matrix:
         apt:
           packages:
             - libnss3-tools
       env:
         - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=firefox:nightly
     - name: "stability (Chrome Dev)"
       if: type = pull_request
       os: linux
-      sudo: required
       python: "2.7"
       addons:
         apt:
           packages:
             - libappindicator1
             - fonts-liberation
       env:
         - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
--- a/testing/web-platform/tests/tools/serve/test_functional.py
+++ b/testing/web-platform/tests/tools/serve/test_functional.py
@@ -50,17 +50,17 @@ def test_subprocess_exit(server_subproce
     def target():
         # By default, the server initially creates a child process to validate
         # local system configuration. That process is unrelated to the behavior
         # under test, but at the time of this writing, the parent uses the same
         # constructor that is also used to create the long-running processes
         # which are relevant to this functionality. Disable the check so that
         # the constructor is only used to create relevant processes.
         with open(tempfile_name, 'w') as handle:
-            json.dump({"check_subdomains": False}, handle)
+            json.dump({"check_subdomains": False, "bind_address": False}, handle)
 
         # The `logger` module from the wptserver package uses a singleton
         # pattern which resists testing. In order to avoid conflicting with
         # other tests which rely on that module, pre-existing state is
         # discarded through an explicit "reload" operation.
         reload(logger)
 
         serve.run(config_path=tempfile_name)