diff options
author | Matt Mastracci <matthew@mastracci.com> | 2024-02-09 13:33:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 13:33:05 -0700 |
commit | dcbbcd23f5dd8601e2851aded4cabc6557164363 (patch) | |
tree | f9c3842b8c80028c6ab8e298a4d08ac828eff11d /cli/tests | |
parent | 24bdc1de33494bc1619bfebea826ab08ffb74a01 (diff) |
refactor: split integration tests from CLI (part 1) (#22308)
This PR separates integration tests from CLI tests into a new project
named `cli_tests`. This is a prerequisite for an integration test runner
that can work with either the CLI binary in the current project, or one
that is built ahead of time.
## Background
Rust does not have the concept of artifact dependencies yet
(https://github.com/rust-lang/cargo/issues/9096). Because of this, the
only way we can ensure a binary is built before running associated tests
is by hanging tests off the crate with the binary itself.
Unfortunately this means that to run those tests, you _must_ build the
binary and in the case of the deno executable that might be a 10 minute
wait in release mode.
## Implementation
To allow for tests to run with and without the requirement that the
binary is up-to-date, we split the integration tests into a project of
their own. As these tests would not require the binary to build itself
before being run as-is, we add a stub integration `[[test]]` target in
the `cli` project that invokes these tests using `cargo test`.
The stub test runner we add has `harness = false` so that we can get
access to a `main` function. This `main` function's sole job is to
`execvp` the command `cargo test -p deno_cli`, effectively "calling"
another cargo target.
This ensures that the deno executable is always correctly rebuilt before
running the stub test runner from `cli`, and gets us closer to be able
to run the entire integration test suite on arbitrary deno executables
(and therefore split the build into multiple phases).
The new `cli_tests` project lives within `cli` to avoid a large PR. In
later PRs, the test data will be split from the `cli` project. As there
are a few thousand files, it'll be better to do this as a completely
separate PR to avoid noise.
Diffstat (limited to 'cli/tests')
-rw-r--r-- | cli/tests/Cargo.toml | 51 | ||||
-rw-r--r-- | cli/tests/integration/cert_tests.rs | 8 | ||||
-rw-r--r-- | cli/tests/integration/inspector_tests.rs | 2 | ||||
-rw-r--r-- | cli/tests/integration/js_unit_tests.rs | 2 | ||||
-rw-r--r-- | cli/tests/integration/node_unit_tests.rs | 2 | ||||
-rw-r--r-- | cli/tests/integration/run_tests.rs | 2 | ||||
-rw-r--r-- | cli/tests/integration_tests.rs | 1 | ||||
-rw-r--r-- | cli/tests/integration_tests_runner.rs | 18 | ||||
-rw-r--r-- | cli/tests/lib.rs | 1 |
9 files changed, 79 insertions, 8 deletions
diff --git a/cli/tests/Cargo.toml b/cli/tests/Cargo.toml new file mode 100644 index 000000000..6ad5984e2 --- /dev/null +++ b/cli/tests/Cargo.toml @@ -0,0 +1,51 @@ +# Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +[package] +name = "cli_tests" +version = "0.0.0" +authors.workspace = true +autotests = false +edition.workspace = true +license.workspace = true +repository.workspace = true + +[lib] +path = "lib.rs" + +[features] +run = [] + +[[test]] +name = "integration_tests" +path = "integration_tests.rs" +required-features = ["run"] + +[dev-dependencies] +bytes.workspace = true +deno_ast.workspace = true +deno_bench_util.workspace = true +deno_core = { workspace = true, features = ["include_js_files_for_snapshotting", "unsafe_use_unprotected_platform"] } +deno_fetch.workspace = true +deno_lockfile.workspace = true +deno_tls.workspace = true +fastwebsockets = { workspace = true, features = ["upgrade", "unstable-split"] } +flaky_test = "=0.1.0" +http.workspace = true +http-body-util.workspace = true +hyper.workspace = true +hyper-util.workspace = true +once_cell.workspace = true +os_pipe.workspace = true +pretty_assertions.workspace = true +serde.workspace = true +serde_repr.workspace = true +test_util.workspace = true +tokio.workspace = true +tokio-util.workspace = true +tower-lsp.workspace = true +trust-dns-client = "=0.22.0" +trust-dns-server = "=0.22.1" +url.workspace = true + +[target.'cfg(unix)'.dev-dependencies] +nix.workspace = true diff --git a/cli/tests/integration/cert_tests.rs b/cli/tests/integration/cert_tests.rs index 484d053f8..9e89a9f3e 100644 --- a/cli/tests/integration/cert_tests.rs +++ b/cli/tests/integration/cert_tests.rs @@ -1,14 +1,14 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use deno_runtime::deno_net::ops_tls::TlsStream; -use deno_runtime::deno_tls::rustls; -use deno_runtime::deno_tls::rustls_pemfile; -use lsp_types::Url; +use deno_tls::rustls; +use deno_tls::rustls_pemfile; +use deno_tls::rustls_tokio_stream::TlsStream; use std::io::BufReader; use std::io::Cursor; use std::io::Read; use std::sync::Arc; use test_util as util; +use url::Url; use util::testdata_path; use util::TestContext; diff --git a/cli/tests/integration/inspector_tests.rs b/cli/tests/integration/inspector_tests.rs index 872f9e3d2..bbe70ae5e 100644 --- a/cli/tests/integration/inspector_tests.rs +++ b/cli/tests/integration/inspector_tests.rs @@ -6,7 +6,7 @@ use deno_core::error::AnyError; use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::url; -use deno_runtime::deno_fetch::reqwest; +use deno_fetch::reqwest; use fastwebsockets::FragmentCollector; use fastwebsockets::Frame; use fastwebsockets::WebSocket; diff --git a/cli/tests/integration/js_unit_tests.rs b/cli/tests/integration/js_unit_tests.rs index 748c0fe5a..0e3a1a118 100644 --- a/cli/tests/integration/js_unit_tests.rs +++ b/cli/tests/integration/js_unit_tests.rs @@ -7,7 +7,7 @@ use test_util as util; util::unit_test_factory!( js_unit_test, - "tests/unit", + "../tests/unit", "*.ts", [ abort_controller_test, diff --git a/cli/tests/integration/node_unit_tests.rs b/cli/tests/integration/node_unit_tests.rs index b0259663d..5afaf48c5 100644 --- a/cli/tests/integration/node_unit_tests.rs +++ b/cli/tests/integration/node_unit_tests.rs @@ -8,7 +8,7 @@ use util::env_vars_for_npm_tests; util::unit_test_factory!( node_unit_test, - "tests/unit_node", + "../tests/unit_node", "**/*_test.ts", [ _fs_access_test = _fs / _fs_access_test, diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs index 3d14bb0bb..428de3238 100644 --- a/cli/tests/integration/run_tests.rs +++ b/cli/tests/integration/run_tests.rs @@ -3,7 +3,7 @@ use bytes::Bytes; use deno_core::serde_json::json; use deno_core::url; -use deno_runtime::deno_fetch::reqwest; +use deno_fetch::reqwest; use pretty_assertions::assert_eq; use std::io::Read; use std::io::Write; diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 967cf6afe..8469b5416 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -3,4 +3,5 @@ // The tests exist in a sub folder instead of as separate files in // this directory so that cargo doesn't compile each file as a new crate. +#[cfg(test)] mod integration; diff --git a/cli/tests/integration_tests_runner.rs b/cli/tests/integration_tests_runner.rs new file mode 100644 index 000000000..12e83a019 --- /dev/null +++ b/cli/tests/integration_tests_runner.rs @@ -0,0 +1,18 @@ +// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. +pub fn main() { + let mut args = vec!["cargo", "test", "-p", "cli_tests", "--features", "run"]; + + if !cfg!(debug_assertions) { + args.push("--release"); + } + + args.push("--"); + + // If any args were passed to this process, pass them through to the child + let orig_args = std::env::args().skip(1).collect::<Vec<_>>(); + let orig_args: Vec<&str> = + orig_args.iter().map(|x| x.as_ref()).collect::<Vec<_>>(); + args.extend(orig_args); + + test_util::spawn::exec_replace("cargo", &args).unwrap(); +} diff --git a/cli/tests/lib.rs b/cli/tests/lib.rs new file mode 100644 index 000000000..0a39b9f87 --- /dev/null +++ b/cli/tests/lib.rs @@ -0,0 +1 @@ +// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. |