From f05a896ac385a57467eeabf675014134ac108a44 Mon Sep 17 00:00:00 2001 From: l00556901 Date: Wed, 26 Jun 2024 00:20:31 +0800 Subject: [PATCH 1/3] test: migrate dep_info to snapbox --- tests/testsuite/dep_info.rs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index 71d157f1f16..805cdc2801e 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -1,8 +1,6 @@ //! Tests for dep-info files. This includes the dep-info file Cargo creates in //! the output directory, and the ones stored in the fingerprint. -#![allow(deprecated)] - use cargo_test_support::compare::assert_e2e; use cargo_test_support::paths::{self, CargoPathExt}; use cargo_test_support::registry::Package; @@ -323,7 +321,11 @@ fn relative_depinfo_paths_ws() { p.cargo("build -Z binary-dep-depinfo --target") .arg(&host) .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr_contains("[COMPILING] foo [..]") + .with_stderr_data(str![[r#" +... +[COMPILING] foo v0.1.0 ([ROOT]/foo/foo) +... +"#]]) .run(); assert_deps_contains( @@ -360,7 +362,10 @@ fn relative_depinfo_paths_ws() { p.cargo("build -Z binary-dep-depinfo --target") .arg(&host) .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr("[FINISHED] `dev` profile [..]") + .with_stderr_data(str![[r#" +[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s + +"#]]) .run(); } @@ -446,7 +451,11 @@ fn relative_depinfo_paths_no_ws() { p.cargo("build -Z binary-dep-depinfo") .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr_contains("[COMPILING] foo [..]") + .with_stderr_data(str![[r#" +... +[COMPILING] foo v0.1.0 ([ROOT]/foo) +... +"#]]) .run(); assert_deps_contains( @@ -482,7 +491,10 @@ fn relative_depinfo_paths_no_ws() { // Make sure it stays fresh. p.cargo("build -Z binary-dep-depinfo") .masquerade_as_nightly_cargo(&["binary-dep-depinfo"]) - .with_stderr("[FINISHED] `dev` profile [..]") + .with_stderr_data(str![[r#" +[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s + +"#]]) .run(); } From 11506bbd9ac7adc5bff25e3669fccf4e247f60bd Mon Sep 17 00:00:00 2001 From: l00556901 Date: Wed, 26 Jun 2024 00:21:20 +0800 Subject: [PATCH 2/3] test: migrate diagnostics to snapbox --- tests/testsuite/diagnostics.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/testsuite/diagnostics.rs b/tests/testsuite/diagnostics.rs index 68b95fc2fea..af561cb5d61 100644 --- a/tests/testsuite/diagnostics.rs +++ b/tests/testsuite/diagnostics.rs @@ -1,6 +1,5 @@ -#![allow(deprecated)] - use cargo_test_support::project; +use cargo_test_support::str; #[cargo_test] fn dont_panic_on_render() { @@ -20,15 +19,14 @@ edition = "2021" p.cargo("check") .with_status(101) - .with_stderr( - "\ -error: invalid type: map, expected a sequence + .with_stderr_data(str![[r#" +[ERROR] invalid type: map, expected a sequence --> Cargo.toml:6:3 | 6 | [[bench.foo]] | ^^^^^ | -", - ) + +"#]]) .run(); } From 113dcf6208688d597beec21e9625322ef3ef94be Mon Sep 17 00:00:00 2001 From: l00556901 Date: Wed, 26 Jun 2024 00:22:01 +0800 Subject: [PATCH 3/3] test: migrate direct_minimal_versions to snapbox --- tests/testsuite/direct_minimal_versions.rs | 54 ++++++++++------------ 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/tests/testsuite/direct_minimal_versions.rs b/tests/testsuite/direct_minimal_versions.rs index b3c2136c8b4..e96436fc124 100644 --- a/tests/testsuite/direct_minimal_versions.rs +++ b/tests/testsuite/direct_minimal_versions.rs @@ -2,10 +2,9 @@ //! //! Note: Some tests are located in the resolver-tests package. -#![allow(deprecated)] - use cargo_test_support::project; use cargo_test_support::registry::Package; +use cargo_test_support::str; #[cargo_test] fn simple() { @@ -30,13 +29,12 @@ fn simple() { p.cargo("generate-lockfile -Zdirect-minimal-versions") .masquerade_as_nightly_cargo(&["direct-minimal-versions"]) - .with_stderr( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `dummy-registry` index [LOCKING] 2 packages [ADDING] dep v1.0.0 (latest: v1.1.0) -", - ) + +"#]]) .run(); let lock = p.read_lockfile(); @@ -79,20 +77,20 @@ fn mixed_dependencies() { p.cargo("generate-lockfile -Zdirect-minimal-versions") .masquerade_as_nightly_cargo(&["direct-minimal-versions"]) .with_status(101) - .with_stderr( - r#"[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `dummy-registry` index [ERROR] failed to select a version for `dep`. - ... required by package `foo v0.0.1 ([CWD])` + ... required by package `foo v0.0.1 ([ROOT]/foo)` versions that meet the requirements `^1.1` are: 1.1.0 all possible versions conflict with previously selected packages. previously selected package `dep v1.0.0` - ... which satisfies dependency `dep = "^1.0"` of package `foo v0.0.1 ([CWD])` + ... which satisfies dependency `dep = "^1.0"` of package `foo v0.0.1 ([ROOT]/foo)` failed to select a version for `dep` which could resolve this conflict -"#, - ) + +"#]]) .run(); } @@ -120,13 +118,12 @@ fn yanked() { p.cargo("generate-lockfile -Zdirect-minimal-versions") .masquerade_as_nightly_cargo(&["direct-minimal-versions"]) - .with_stderr( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `dummy-registry` index [LOCKING] 2 packages [ADDING] dep v1.1.0 (latest: v1.2.0) -", - ) + +"#]]) .run(); let lock = p.read_lockfile(); @@ -175,13 +172,12 @@ fn indirect() { p.cargo("generate-lockfile -Zdirect-minimal-versions") .masquerade_as_nightly_cargo(&["direct-minimal-versions"]) - .with_stderr( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `dummy-registry` index [LOCKING] 3 packages [ADDING] direct v1.0.0 (latest: v1.1.0) -", - ) + +"#]]) .run(); let lock = p.read_lockfile(); @@ -240,20 +236,20 @@ fn indirect_conflict() { p.cargo("generate-lockfile -Zdirect-minimal-versions") .masquerade_as_nightly_cargo(&["direct-minimal-versions"]) .with_status(101) - .with_stderr( - r#"[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `dummy-registry` index [ERROR] failed to select a version for `indirect`. ... required by package `direct v1.0.0` - ... which satisfies dependency `direct = "^1.0"` of package `foo v0.0.1 ([CWD])` + ... which satisfies dependency `direct = "^1.0"` of package `foo v0.0.1 ([ROOT]/foo)` versions that meet the requirements `^2.1` are: 2.2.0, 2.1.0 all possible versions conflict with previously selected packages. previously selected package `indirect v2.0.0` - ... which satisfies dependency `indirect = "^2.0"` of package `foo v0.0.1 ([CWD])` + ... which satisfies dependency `indirect = "^2.0"` of package `foo v0.0.1 ([ROOT]/foo)` failed to select a version for `indirect` which could resolve this conflict -"#, - ) + +"#]]) .run(); }