summaryrefslogtreecommitdiff
path: root/cli/tests/integration/node_unit_tests.rs
diff options
context:
space:
mode:
authorMatt Mastracci <matthew@mastracci.com>2023-05-22 13:35:59 -0600
committerGitHub <noreply@github.com>2023-05-22 13:35:59 -0600
commit612226de8e2fe3068d981866242bacedfceb9734 (patch)
tree318d644be0770ce1bff9bf1ceff415c0b4705ec2 /cli/tests/integration/node_unit_tests.rs
parentffa020f43a2a0d04fade562b2f82cd1a39913780 (diff)
chore(cli): One Rust test per JS and Node unit test file (#19199)
This runs our `js_unit_tests` and `node_unit_tests` in parallel, one rust test per JS unit test file. Some of our JS tests don't like running in parallel due to port requirements, so this also makes those use a specific port-per-file. This does not attempt to make the node-compat tests work.
Diffstat (limited to 'cli/tests/integration/node_unit_tests.rs')
-rw-r--r--cli/tests/integration/node_unit_tests.rs150
1 files changed, 142 insertions, 8 deletions
diff --git a/cli/tests/integration/node_unit_tests.rs b/cli/tests/integration/node_unit_tests.rs
index d2a6f6ec8..2cde51552 100644
--- a/cli/tests/integration/node_unit_tests.rs
+++ b/cli/tests/integration/node_unit_tests.rs
@@ -1,12 +1,80 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-
+use std::io::BufRead;
+use std::io::BufReader;
+use std::process::Stdio;
+use std::time::Duration;
+use std::time::Instant;
use test_util as util;
-#[test]
-fn node_unit_tests() {
+util::unit_test_factory!(
+ node_unit_test,
+ "tests/unit_node",
+ "**/*_test.ts",
+ [
+ _fs_access_test = _fs / _fs_access_test,
+ _fs_appendFile_test = _fs / _fs_appendFile_test,
+ _fs_chmod_test = _fs / _fs_chmod_test,
+ _fs_chown_test = _fs / _fs_chown_test,
+ _fs_close_test = _fs / _fs_close_test,
+ _fs_copy_test = _fs / _fs_copy_test,
+ _fs_dir_test = _fs / _fs_dir_test,
+ _fs_exists_test = _fs / _fs_exists_test,
+ _fs_fdatasync_test = _fs / _fs_fdatasync_test,
+ _fs_fstat_test = _fs / _fs_fstat_test,
+ _fs_fsync_test = _fs / _fs_fsync_test,
+ _fs_ftruncate_test = _fs / _fs_ftruncate_test,
+ _fs_futimes_test = _fs / _fs_futimes_test,
+ _fs_link_test = _fs / _fs_link_test,
+ _fs_lstat_test = _fs / _fs_lstat_test,
+ _fs_mkdir_test = _fs / _fs_mkdir_test,
+ _fs_mkdtemp_test = _fs / _fs_mkdtemp_test,
+ _fs_opendir_test = _fs / _fs_opendir_test,
+ _fs_readFile_test = _fs / _fs_readFile_test,
+ _fs_readdir_test = _fs / _fs_readdir_test,
+ _fs_readlink_test = _fs / _fs_readlink_test,
+ _fs_realpath_test = _fs / _fs_realpath_test,
+ _fs_rename_test = _fs / _fs_rename_test,
+ _fs_rm_test = _fs / _fs_rm_test,
+ _fs_rmdir_test = _fs / _fs_rmdir_test,
+ _fs_stat_test = _fs / _fs_stat_test,
+ _fs_symlink_test = _fs / _fs_symlink_test,
+ _fs_truncate_test = _fs / _fs_truncate_test,
+ _fs_unlink_test = _fs / _fs_unlink_test,
+ _fs_utimes_test = _fs / _fs_utimes_test,
+ _fs_watch_test = _fs / _fs_watch_test,
+ _fs_write_test = _fs / _fs_write_test,
+ async_hooks_test,
+ child_process_test,
+ crypto_cipher_test = crypto / crypto_cipher_test,
+ crypto_hash_test = crypto / crypto_hash_test,
+ crypto_key_test = crypto / crypto_key_test,
+ crypto_sign_test = crypto / crypto_sign_test,
+ fs_test,
+ http_test,
+ _randomBytes_test = internal / _randomBytes_test,
+ _randomFill_test = internal / _randomFill_test,
+ _randomInt_test = internal / _randomInt_test,
+ pbkdf2_test = internal / pbkdf2_test,
+ scrypt_test = internal / scrypt_test,
+ module_test,
+ process_test,
+ querystring_test,
+ readline_test,
+ string_decoder_test,
+ timers_test,
+ tls_test,
+ tty_test,
+ util_test,
+ v8_test,
+ worker_threads_test
+ ]
+);
+
+fn node_unit_test(test: String) {
let _g = util::http_server();
- let mut deno = util::deno_cmd()
+ let mut deno = util::deno_cmd();
+ let mut deno = deno
.current_dir(util::root_path())
.arg("test")
.arg("--unstable")
@@ -14,12 +82,78 @@ fn node_unit_tests() {
// but this shouldn't be necessary. tls.connect currently doesn't
// pass hostname option correctly and it causes cert errors.
.arg("--unsafely-ignore-certificate-errors")
- .arg("-A")
- .arg(util::tests_path().join("unit_node"))
+ .arg("-A");
+ // Parallel tests for crypto
+ if test.starts_with("crypto/") {
+ deno = deno.arg("--parallel");
+ }
+ let mut deno = deno
+ .arg(
+ util::tests_path()
+ .join("unit_node")
+ .join(format!("{test}.ts")),
+ )
+ .stderr(Stdio::piped())
+ .stdout(Stdio::piped())
.spawn()
.expect("failed to spawn script");
- let status = deno.wait().expect("failed to wait for the child process");
- assert_eq!(Some(0), status.code());
+ let now = Instant::now();
+ let stdout = deno.stdout.take().unwrap();
+ let test_name = test.clone();
+ let stdout = std::thread::spawn(move || {
+ let reader = BufReader::new(stdout);
+ for line in reader.lines() {
+ if let Ok(line) = line {
+ println!("[{test_name} {:0>6.2}] {line}", now.elapsed().as_secs_f32());
+ } else {
+ break;
+ }
+ }
+ });
+
+ let now = Instant::now();
+ let stderr = deno.stderr.take().unwrap();
+ let test_name = test.clone();
+ let stderr = std::thread::spawn(move || {
+ let reader = BufReader::new(stderr);
+ for line in reader.lines() {
+ if let Ok(line) = line {
+ eprintln!("[{test_name} {:0>6.2}] {line}", now.elapsed().as_secs_f32());
+ } else {
+ break;
+ }
+ }
+ });
+
+ const PER_TEST_TIMEOUT: Duration = Duration::from_secs(5 * 60);
+
+ let now = Instant::now();
+ let status = loop {
+ if now.elapsed() > PER_TEST_TIMEOUT {
+ // Last-ditch kill
+ _ = deno.kill();
+ panic!("Test {test} failed to complete in time");
+ }
+ if let Some(status) = deno
+ .try_wait()
+ .expect("failed to wait for the child process")
+ {
+ break status;
+ }
+ std::thread::sleep(Duration::from_millis(100));
+ };
+
+ #[cfg(unix)]
+ assert_eq!(
+ std::os::unix::process::ExitStatusExt::signal(&status),
+ None,
+ "Deno should not have died with a signal"
+ );
+ assert_eq!(Some(0), status.code(), "Deno should have exited cleanly");
+
+ stdout.join().unwrap();
+ stderr.join().unwrap();
+
assert!(status.success());
}