From 10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 14:41:41 +0200 Subject: Merging upstream version 1.70.0+dfsg2. Signed-off-by: Daniel Baumann --- .../cargo/tests/testsuite/cargo_add/namever/in | 1 + .../cargo/tests/testsuite/cargo_add/namever/mod.rs | 25 ++++++++++++++++++++++ .../testsuite/cargo_add/namever/out/Cargo.toml | 10 +++++++++ .../tests/testsuite/cargo_add/namever/stderr.log | 4 ++++ .../tests/testsuite/cargo_add/namever/stdout.log | 0 5 files changed, 40 insertions(+) create mode 120000 src/tools/cargo/tests/testsuite/cargo_add/namever/in create mode 100644 src/tools/cargo/tests/testsuite/cargo_add/namever/mod.rs create mode 100644 src/tools/cargo/tests/testsuite/cargo_add/namever/out/Cargo.toml create mode 100644 src/tools/cargo/tests/testsuite/cargo_add/namever/stderr.log create mode 100644 src/tools/cargo/tests/testsuite/cargo_add/namever/stdout.log (limited to 'src/tools/cargo/tests/testsuite/cargo_add/namever') diff --git a/src/tools/cargo/tests/testsuite/cargo_add/namever/in b/src/tools/cargo/tests/testsuite/cargo_add/namever/in new file mode 120000 index 000000000..6c6a27fcf --- /dev/null +++ b/src/tools/cargo/tests/testsuite/cargo_add/namever/in @@ -0,0 +1 @@ +../add-basic.in \ No newline at end of file diff --git a/src/tools/cargo/tests/testsuite/cargo_add/namever/mod.rs b/src/tools/cargo/tests/testsuite/cargo_add/namever/mod.rs new file mode 100644 index 000000000..90fda1a9f --- /dev/null +++ b/src/tools/cargo/tests/testsuite/cargo_add/namever/mod.rs @@ -0,0 +1,25 @@ +use cargo_test_support::compare::assert_ui; +use cargo_test_support::prelude::*; +use cargo_test_support::Project; + +use crate::cargo_add::init_registry; +use cargo_test_support::curr_dir; + +#[cargo_test] +fn case() { + init_registry(); + let project = Project::from_template(curr_dir!().join("in")); + let project_root = project.root(); + let cwd = &project_root; + + snapbox::cmd::Command::cargo_ui() + .arg("add") + .arg_line("my-package1@>=0.1.1 my-package2@0.2.3 my-package") + .current_dir(cwd) + .assert() + .success() + .stdout_matches_path(curr_dir!().join("stdout.log")) + .stderr_matches_path(curr_dir!().join("stderr.log")); + + assert_ui().subset_matches(curr_dir!().join("out"), &project_root); +} diff --git a/src/tools/cargo/tests/testsuite/cargo_add/namever/out/Cargo.toml b/src/tools/cargo/tests/testsuite/cargo_add/namever/out/Cargo.toml new file mode 100644 index 000000000..1704d3435 --- /dev/null +++ b/src/tools/cargo/tests/testsuite/cargo_add/namever/out/Cargo.toml @@ -0,0 +1,10 @@ +[workspace] + +[package] +name = "cargo-list-test-fixture" +version = "0.0.0" + +[dependencies] +my-package = "99999.0.0" +my-package1 = ">=0.1.1" +my-package2 = "0.2.3" diff --git a/src/tools/cargo/tests/testsuite/cargo_add/namever/stderr.log b/src/tools/cargo/tests/testsuite/cargo_add/namever/stderr.log new file mode 100644 index 000000000..17be8f9d8 --- /dev/null +++ b/src/tools/cargo/tests/testsuite/cargo_add/namever/stderr.log @@ -0,0 +1,4 @@ + Updating `dummy-registry` index + Adding my-package1 >=0.1.1 to dependencies. + Adding my-package2 v0.2.3 to dependencies. + Adding my-package v99999.0.0 to dependencies. diff --git a/src/tools/cargo/tests/testsuite/cargo_add/namever/stdout.log b/src/tools/cargo/tests/testsuite/cargo_add/namever/stdout.log new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3