diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-02-06 21:06:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-07 02:06:34 +0000 |
| commit | 227ec14e6ca596bb4ddcb2ee2ec82311f0ac87e5 (patch) | |
| tree | 5d932e90505ab2879b6eea10cbdbdc63857fed7e /test_util/src | |
| parent | 043fee48fd72fbce2357e93431753db5b086cffd (diff) | |
chore: use same test server for jsr tests (#22303)
We had two test servers.
Diffstat (limited to 'test_util/src')
| -rw-r--r-- | test_util/src/builders.rs | 4 | ||||
| -rw-r--r-- | test_util/src/lib.rs | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test_util/src/builders.rs b/test_util/src/builders.rs index 8d04dae48..f0002b52f 100644 --- a/test_util/src/builders.rs +++ b/test_util/src/builders.rs @@ -24,6 +24,7 @@ use crate::env_vars_for_jsr_tests; use crate::env_vars_for_npm_tests; use crate::fs::PathRef; use crate::http_server; +use crate::jsr_registry_unset_url; use crate::lsp::LspClientBuilder; use crate::npm_registry_unset_url; use crate::pty::Pty; @@ -686,6 +687,9 @@ impl TestCommandBuilder { if !envs.contains_key("DENO_NO_UPDATE_CHECK") { envs.insert("DENO_NO_UPDATE_CHECK".to_string(), "1".to_string()); } + if !envs.contains_key("DENO_REGISTRY_URL") { + envs.insert("DENO_REGISTRY_URL".to_string(), jsr_registry_unset_url()); + } for key in &self.envs_remove { envs.remove(key); } diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs index bcd58a3a6..9bf68cbc2 100644 --- a/test_util/src/lib.rs +++ b/test_util/src/lib.rs @@ -100,7 +100,11 @@ pub fn npm_registry_unset_url() -> String { } pub fn jsr_registry_url() -> String { - "http://localhost:4545/jsr/registry/".to_string() + "http://127.0.0.1:4250/".to_string() +} + +pub fn jsr_registry_unset_url() -> String { + "http://DENO_REGISTRY_URL.is.unset".to_string() } pub fn std_path() -> PathRef { @@ -441,6 +445,7 @@ pub fn deno_cmd_with_deno_dir(deno_dir: &TempDir) -> TestCommandBuilder { TestCommandBuilder::new(deno_dir.clone()) .env("DENO_DIR", deno_dir.path()) .env("NPM_CONFIG_REGISTRY", npm_registry_unset_url()) + .env("DENO_REGISTRY_URL", jsr_registry_unset_url()) } pub fn run_powershell_script_file( |