Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename address space override ports from private to local #46942

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rename address space override ports from private to local #46942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a6cc4
Rename address space override ports from private to local
atjn Jun 29, 2024
52e82c4
Rename private address space overrides ports in tests
atjn Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename address space override ports from private to local
  • Loading branch information
@atjn
atjn committed Jun 29, 2024
commit 57a6cc400fa04dfe18fea0ed197bbfa95dac4a61
8 changes: 4 additions & 4 deletions tools/serve/serve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,10 +792,10 @@ def start_servers(logger, host, ports, paths, routes, bind_address, config,

init_func = {
"http": start_http_server,
"http-private": start_http_server,
"http-local": start_http_server,
"http-public": start_http_server,
"https": start_https_server,
"https-private": start_https_server,
"https-local": start_https_server,
"https-public": start_https_server,
"h2": start_http2_server,
"ws": start_ws_server,
Expand Down Expand Up @@ -1026,10 +1026,10 @@ class ConfigBuilder(config.ConfigBuilder):
"server_host": None,
"ports": {
"http": [8000, "auto"],
"http-private": ["auto"],
"http-local": ["auto"],
"http-public": ["auto"],
"https": [8443, 8444],
"https-private": ["auto"],
"https-local": ["auto"],
"https-public": ["auto"],
"ws": ["auto"],
"wss": ["auto"],
Expand Down
6 changes: 3 additions & 3 deletions tools/wptrunner/wptrunner/browsers/chrome.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data, subsuite
# changes the viewport, which can happen during the test run.
chrome_options["args"].append("--disable-infobars")

# Classify `http-private`, `http-public` and https variants in the
# Classify `http-local`, `http-public` and https variants in the
# appropriate IP address spaces.
# For more details, see: https://github.com/web-platform-tests/rfcs/blob/master/rfcs/address_space_overrides.md
address_space_overrides_ports = [
("http-private", "private"),
("http-local", "private"),
("http-public", "public"),
("https-private", "private"),
("https-local", "private"),
("https-public", "public"),
]
address_space_overrides_arg = ",".join(
Expand Down
4 changes: 2 additions & 2 deletions tools/wptrunner/wptrunner/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ def build_config(self):

ports = {
"http": [8000, 8001],
"http-private": [8002],
"http-local": [8002],
"http-public": [8003],
"https": [8443, 8444],
"https-private": [8445],
"https-local": [8445],
"https-public": [8446],
"ws": [8888],
"wss": [8889],
Expand Down