summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/cache_tests.rs4
-rw-r--r--tests/integration/compile_tests.rs4
-rw-r--r--tests/integration/npm_tests.rs62
-rw-r--r--tests/integration/run_tests.rs20
-rw-r--r--tests/integration/vendor_tests.rs8
5 files changed, 56 insertions, 42 deletions
diff --git a/tests/integration/cache_tests.rs b/tests/integration/cache_tests.rs
index 120b06474..809d10791 100644
--- a/tests/integration/cache_tests.rs
+++ b/tests/integration/cache_tests.rs
@@ -39,8 +39,8 @@ fn cache_matching_package_json_dep_should_not_install_all() {
.args("cache npm:@types/node@18.8.2")
.run();
output.assert_matches_text(concat!(
- "Download http://localhost:4558/@types/node\n",
- "Download http://localhost:4558/@types/node/node-18.8.2.tgz\n",
+ "Download http://localhost:4260/@types/node\n",
+ "Download http://localhost:4260/@types/node/node-18.8.2.tgz\n",
"Initialize @types/node@18.8.2\n",
));
}
diff --git a/tests/integration/compile_tests.rs b/tests/integration/compile_tests.rs
index c20f8e66a..0d94d4367 100644
--- a/tests/integration/compile_tests.rs
+++ b/tests/integration/compile_tests.rs
@@ -1083,8 +1083,8 @@ console.log(getValue());"#,
.run();
output.assert_exit_code(0);
output.assert_matches_text(
- r#"Download http://localhost:4558/@denotest/esm-basic
-Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz
+ r#"Download http://localhost:4260/@denotest/esm-basic
+Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz
Initialize @denotest/esm-basic@1.0.0
Check file:///[WILDCARD]/main.ts
Compile file:///[WILDCARD]/main.ts to [WILDCARD]
diff --git a/tests/integration/npm_tests.rs b/tests/integration/npm_tests.rs
index cdad7462e..4c4868c65 100644
--- a/tests/integration/npm_tests.rs
+++ b/tests/integration/npm_tests.rs
@@ -921,7 +921,7 @@ fn node_modules_dir_cache() {
let package_global_cache_dir = deno_dir
.path()
.join("npm")
- .join("localhost_4558")
+ .join("localhost_4260")
.join("@denotest")
.join("dual-cjs-esm")
.join("1.0.0");
@@ -1507,7 +1507,7 @@ fn auto_discover_lock_file() {
.run();
output
.assert_matches_text(
-r#"Download http://localhost:4558/@denotest/bin
+r#"Download http://localhost:4260/@denotest/bin
error: Integrity check failed for package: "npm:@denotest/bin@1.0.0". Unable to verify that the package
is the same as when the lockfile was generated.
@@ -1546,7 +1546,7 @@ fn peer_deps_with_copied_folders_and_lockfile() {
let grandchild_path = deno_dir
.path()
.join("npm")
- .join("localhost_4558")
+ .join("localhost_4260")
.join("@denotest")
.join("peer-dep-test-grandchild");
assert!(grandchild_path.join("1.0.0").exists());
@@ -1660,8 +1660,8 @@ itest!(non_existent_dep {
exit_code: 1,
output_str: Some(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/non-existent-dep\n",
- "Download http://localhost:4558/@denotest/non-existent\n",
+ "Download http://localhost:4260/@denotest/non-existent-dep\n",
+ "Download http://localhost:4260/@denotest/non-existent\n",
"[UNORDERED_END]\n",
"error: npm package '@denotest/non-existent' does not exist.\n"
)),
@@ -1674,14 +1674,14 @@ itest!(non_existent_dep_version {
exit_code: 1,
output_str: Some(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/non-existent-dep-version\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/non-existent-dep-version\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
"[UNORDERED_END]\n",
// does two downloads because when failing once it max tries to
// get the latest version a second time
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/non-existent-dep-version\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/non-existent-dep-version\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
"[UNORDERED_END]\n",
"error: Could not find npm package '@denotest/esm-basic' matching '=99.99.99'.\n"
)),
@@ -1706,7 +1706,7 @@ fn reload_info_not_found_cache_but_exists_remote() {
version: &str,
) {
let registry_json_path =
- format!("npm/localhost_4558/{}/registry.json", package);
+ format!("npm/localhost_4260/{}/registry.json", package);
let mut registry_json: Value =
serde_json::from_str(&deno_dir.read_to_string(&registry_json_path))
.unwrap();
@@ -1743,12 +1743,12 @@ fn reload_info_not_found_cache_but_exists_remote() {
.run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
- "Download http://localhost:4558/@denotest/cjs-default-export/1.0.0.tgz\n",
- "Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default/1.0.0.tgz\n",
"[UNORDERED_END]\n",
));
@@ -1773,8 +1773,8 @@ fn reload_info_not_found_cache_but_exists_remote() {
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
"[UNORDERED_END]\n",
"Node esm importing node cjs\n[WILDCARD]",
));
@@ -1805,8 +1805,8 @@ fn reload_info_not_found_cache_but_exists_remote() {
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
"[UNORDERED_END]\n",
"Node esm importing node cjs\n[WILDCARD]",
));
@@ -1843,8 +1843,8 @@ fn reload_info_not_found_cache_but_exists_remote() {
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
"[UNORDERED_END]\n",
"[UNORDERED_START]\n",
"Initialize @denotest/cjs-default-export@1.0.0\n",
@@ -1880,9 +1880,9 @@ fn reload_info_not_found_cache_but_exists_remote() {
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
"[UNORDERED_END]\n",
"Initialize @denotest/esm-basic@1.0.0\n",
"Node esm importing node cjs\n[WILDCARD]",
@@ -1918,9 +1918,9 @@ fn reload_info_not_found_cache_but_exists_remote() {
let output = test_context.new_command().args("run main.ts").run();
output.assert_matches_text(concat!(
"[UNORDERED_START]\n",
- "Download http://localhost:4558/@denotest/cjs-default-export\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-import-cjs-default\n",
+ "Download http://localhost:4260/@denotest/cjs-default-export\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-import-cjs-default\n",
"[UNORDERED_END]\n",
"Node esm importing node cjs\n[WILDCARD]",
));
@@ -2100,8 +2100,8 @@ fn top_level_install_package_json_explicit_opt_in() {
temp_dir.write("main.ts", "console.log(5);");
let output = test_context.new_command().args("cache main.ts").run();
output.assert_matches_text(concat!(
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
"Initialize @denotest/esm-basic@1.0.0\n",
));
@@ -3087,7 +3087,7 @@ async fn test_private_npm_registry() {
let client = reqwest::Client::new();
- let url = Url::parse("http://127.0.0.1:4559/@denotest2/basic").unwrap();
+ let url = Url::parse("http://127.0.0.1:4261/@denotest2/basic").unwrap();
let req = reqwest::Request::new(reqwest::Method::GET, url.clone());
let resp = client.execute(req).await.unwrap();
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
index 5e9d00a67..88ddfb318 100644
--- a/tests/integration/run_tests.rs
+++ b/tests/integration/run_tests.rs
@@ -977,8 +977,8 @@ fn lock_redirects() {
.run()
.assert_matches_text(concat!(
"Download http://localhost:4545/echo.ts\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
"Hi, there",
));
util::assertions::assert_wildcard_match(
@@ -2830,6 +2830,9 @@ mod permissions {
#[test]
fn net_fetch_allow_localhost_4545() {
+ // ensure the http server is running for those tests so they run
+ // deterministically whether the http server is running or not
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
true,
"run --allow-net=localhost:4545 run/complex_permissions_test.ts netFetch http://localhost:4545/",
@@ -2842,6 +2845,7 @@ mod permissions {
#[test]
fn net_fetch_allow_deno_land() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=deno.land run/complex_permissions_test.ts netFetch http://localhost:4545/",
@@ -2854,6 +2858,7 @@ mod permissions {
#[test]
fn net_fetch_localhost_4545_fail() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=localhost:4545 run/complex_permissions_test.ts netFetch http://localhost:4546/",
@@ -2866,6 +2871,7 @@ mod permissions {
#[test]
fn net_fetch_localhost() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
true,
"run --allow-net=localhost run/complex_permissions_test.ts netFetch http://localhost:4545/ http://localhost:4546/ http://localhost:4547/",
@@ -2878,6 +2884,7 @@ mod permissions {
#[test]
fn net_connect_allow_localhost_ip_4555() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
true,
"run --allow-net=127.0.0.1:4545 run/complex_permissions_test.ts netConnect 127.0.0.1:4545",
@@ -2890,6 +2897,7 @@ mod permissions {
#[test]
fn net_connect_allow_deno_land() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=deno.land run/complex_permissions_test.ts netConnect 127.0.0.1:4546",
@@ -2902,6 +2910,7 @@ mod permissions {
#[test]
fn net_connect_allow_localhost_ip_4545_fail() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=127.0.0.1:4545 run/complex_permissions_test.ts netConnect 127.0.0.1:4546",
@@ -2914,6 +2923,7 @@ mod permissions {
#[test]
fn net_connect_allow_localhost_ip() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
true,
"run --allow-net=127.0.0.1 run/complex_permissions_test.ts netConnect 127.0.0.1:4545 127.0.0.1:4546 127.0.0.1:4547",
@@ -2926,9 +2936,10 @@ mod permissions {
#[test]
fn net_listen_allow_localhost_4555() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
true,
- "run --allow-net=localhost:4558 run/complex_permissions_test.ts netListen localhost:4558",
+ "run --allow-net=localhost:4588 run/complex_permissions_test.ts netListen localhost:4588",
None,
None,
false,
@@ -2938,6 +2949,7 @@ mod permissions {
#[test]
fn net_listen_allow_deno_land() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=deno.land run/complex_permissions_test.ts netListen localhost:4545",
@@ -2950,6 +2962,7 @@ mod permissions {
#[test]
fn net_listen_allow_localhost_4555_fail() {
+ let _http_guard = util::http_server();
let (_, err) = util::run_and_collect_output(
false,
"run --allow-net=localhost:4555 run/complex_permissions_test.ts netListen localhost:4556",
@@ -2962,6 +2975,7 @@ mod permissions {
#[test]
fn net_listen_allow_localhost() {
+ let _http_guard = util::http_server();
// Port 4600 is chosen to not collide with those used by
// target/debug/test_server
let (_, err) = util::run_and_collect_output(
diff --git a/tests/integration/vendor_tests.rs b/tests/integration/vendor_tests.rs
index 7067ac592..e3b79cee0 100644
--- a/tests/integration/vendor_tests.rs
+++ b/tests/integration/vendor_tests.rs
@@ -579,8 +579,8 @@ fn vendor_npm_node_specifiers() {
output.assert_matches_text(format!(
concat!(
"Download http://localhost:4545/vendor/npm_and_node_specifier.ts\n",
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
"{}\n",
"Initialize @denotest/esm-basic@1.0.0\n",
"{}\n\n",
@@ -652,8 +652,8 @@ fn vendor_only_npm_specifiers() {
let output = context.new_command().args("vendor my_app.ts").run();
output.assert_matches_text(format!(
concat!(
- "Download http://localhost:4558/@denotest/esm-basic\n",
- "Download http://localhost:4558/@denotest/esm-basic/1.0.0.tgz\n",
+ "Download http://localhost:4260/@denotest/esm-basic\n",
+ "Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz\n",
"{}\n",
"Initialize @denotest/esm-basic@1.0.0\n",
"{}\n",
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 06:56:38 +0000