test: migrate direct_minimal_versions to snapbox

rust-lang · Jun 25, 2024 · 113dcf6 · 113dcf6
1 parent 11506bb
commit 113dcf6
Showing 1 changed file with 25 additions and 29 deletions.
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();
 }