Bug 1451829 [wpt PR 10333] - Bind StashServer to server_host instead of browser_host, a=testonly
authorRobert Ma <bob1211@gmail.com>
Mon, 09 Apr 2018 22:18:16 +0000
changeset 413764 089cec1a8dd1929f56de03624824eaa18991013f
parent 413763 196cbc3a695e09ae0287d85b0d27d7c3d483f21f
child 413765 11a52ef07c42a4eb79965d1669bf235045f5538f
push id33850
push userapavel@mozilla.com
push dateMon, 16 Apr 2018 09:53:48 +0000
treeherdermozilla-central@6276ec7ebbf3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1451829, 10333
milestone61.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 1451829 [wpt PR 10333] - Bind StashServer to server_host instead of browser_host, a=testonly Automatic update from web-platform-testsBind StashServer to server_host instead of browser_host wpt-commits: d00f7bab7aecadbc2fc9a47172d090b4ba7e2ef2 wpt-pr: 10333 wpt-commits: d00f7bab7aecadbc2fc9a47172d090b4ba7e2ef2 wpt-pr: 10333
testing/web-platform/tests/tools/serve/serve.py
--- a/testing/web-platform/tests/tools/serve/serve.py
+++ b/testing/web-platform/tests/tools/serve/serve.py
@@ -817,27 +817,28 @@ def run(**kwargs):
                          os.path.join(repo_root, "config.json"),
                          **kwargs)
 
     setup_logger(config["log_level"])
 
     with get_ssl_environment(config) as ssl_env:
         ports = get_ports(config, ssl_env)
         config = normalise_config(config, ports)
-        host = config["browser_host"]
+        browser_host = config["browser_host"]
+        server_host = config["server_host"]
         bind_address = config["bind_address"]
 
         if config["check_subdomains"]:
             paths = get_paths(config)
             ssl_config = get_ssl_config(config, ssl_env)
-            check_subdomains(host, paths, bind_address, ssl_config, config["aliases"])
+            check_subdomains(browser_host, paths, bind_address, ssl_config, config["aliases"])
 
         stash_address = None
         if bind_address:
-            stash_address = (host, get_port())
+            stash_address = (server_host, get_port())
 
         with stash.StashServer(stash_address, authkey=str(uuid.uuid4())):
             servers = start(config, ssl_env, build_routes(config["aliases"]), **kwargs)
 
             try:
                 while any(item.is_alive() for item in iter_procs(servers)):
                     for item in iter_procs(servers):
                         item.join(1)