diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-05-07 13:21:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 17:21:56 +0000 |
| commit | 998036b3998301dc53b0dc4700b91d0a9c630702 (patch) | |
| tree | 085a2c13f45434ca169c4ab2a0574c675e46f0d0 /tests/util | |
| parent | f3cc760f2fd40145007ced2a37a3a0b2d1b2d9f3 (diff) | |
chore: fix flaky net_listen_allow_localhost_4555 (#23726)
Moves the test npm registry server port from `4558` to `426x`
Diffstat (limited to 'tests/util')
| -rw-r--r-- | tests/util/server/src/lib.rs | 2 | ||||
| -rw-r--r-- | tests/util/server/src/servers/mod.rs | 8 | ||||
| -rw-r--r-- | tests/util/server/src/servers/npm_registry.rs | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/util/server/src/lib.rs b/tests/util/server/src/lib.rs index eb881e1b7..ec9154af2 100644 --- a/tests/util/server/src/lib.rs +++ b/tests/util/server/src/lib.rs @@ -175,7 +175,7 @@ pub fn deno_config_path() -> PathRef { /// Test server registry url. pub fn npm_registry_url() -> String { - "http://localhost:4558/".to_string() + "http://localhost:4260/".to_string() } pub fn npm_registry_unset_url() -> String { diff --git a/tests/util/server/src/servers/mod.rs b/tests/util/server/src/servers/mod.rs index ca1932e9d..4c86eb451 100644 --- a/tests/util/server/src/servers/mod.rs +++ b/tests/util/server/src/servers/mod.rs @@ -69,10 +69,10 @@ const REDIRECT_ABSOLUTE_PORT: u16 = 4550; const AUTH_REDIRECT_PORT: u16 = 4551; const TLS_CLIENT_AUTH_PORT: u16 = 4552; const BASIC_AUTH_REDIRECT_PORT: u16 = 4554; -// 4555 is used by the proxy server, and 4556 is used by net_listen_allow_localhost_4555_fail +// 4555 is used by the proxy server +// 4556 is used by net_listen_allow_localhost_4555_fail const TLS_PORT: u16 = 4557; -pub(crate) const PUBLIC_NPM_REGISTRY_PORT: u16 = 4558; -pub(crate) const PRIVATE_NPM_REGISTRY_1_PORT: u16 = 4559; +// 4558 is used by net_listen_allow_localhost_4555 const HTTPS_PORT: u16 = 5545; const H1_ONLY_TLS_PORT: u16 = 5546; const H2_ONLY_TLS_PORT: u16 = 5547; @@ -88,6 +88,8 @@ const H2_GRPC_PORT: u16 = 4246; const H2S_GRPC_PORT: u16 = 4247; const JSR_REGISTRY_SERVER_PORT: u16 = 4250; const PROVENANCE_MOCK_SERVER_PORT: u16 = 4251; +pub(crate) const PUBLIC_NPM_REGISTRY_PORT: u16 = 4260; +pub(crate) const PRIVATE_NPM_REGISTRY_1_PORT: u16 = 4261; // Use the single-threaded scheduler. The hyper server is used as a point of // comparison for the (single-threaded!) benchmarks in cli/bench. We're not diff --git a/tests/util/server/src/servers/npm_registry.rs b/tests/util/server/src/servers/npm_registry.rs index 909b9e203..eadfafe02 100644 --- a/tests/util/server/src/servers/npm_registry.rs +++ b/tests/util/server/src/servers/npm_registry.rs @@ -235,7 +235,7 @@ async fn try_serve_npm_registry( } // Replaces URL of public npm registry (`https://registry.npmjs.org/`) with -// the test registry (`http://localhost:4558`). +// the test registry (`http://localhost:4260`). // // These strings end up in `registry.json` files for each downloaded package // that are stored in `tests/testdata/` directory. |