Auto merge of #14143 - heisen-li:dep_dia_dir, r=weihanglo

test: migrate `dep_info/diagnostics/direct_minimal_versions` to snapbox ### What does this PR try to resolve? Complete the migration of the following files: ``` tests/testsuite/dep_info.rs tests/testsuite/diagnostics.rs tests/testsuite/direct_minimal_versions.rs ``` part of #14039
rust-lang · Jun 25, 2024 · ec77aa9 · ec77aa9
2 parents a879a1c + 113dcf6
commit ec77aa9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git 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();
 }
 

diff --git 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();
 }
diff --git 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();
 }