Auto merge of #14200 - eth3lbert:snapbox-g, r=epage

test: migrate generate_lockfile and glob_targets to snapbox ### What does this PR try to resolve? Part of #14039. Migrate following to snapbox: - `tests/testsuite/generate_lockfile.rs` - `tests/testsuite/glob_targets.rs`
rust-lang · Jul 8, 2024 · d1a62df · d1a62df
2 parents 1b2828a + 874c05b
commit d1a62df
Show file tree

Hide file tree

Showing 2 changed files with 276 additions and 302 deletions.
diff --git a/tests/testsuite/generate_lockfile.rs b/tests/testsuite/generate_lockfile.rs
@@ -1,9 +1,8 @@
 //! Tests for the `cargo generate-lockfile` command.
 
-#![allow(deprecated)]
-
 use cargo_test_support::registry::{Package, RegistryBuilder};
-use cargo_test_support::{basic_manifest, paths, project, ProjectBuilder};
+use cargo_test_support::{basic_manifest, paths, project, str, ProjectBuilder};
+use snapbox::IntoData;
 use std::fs;
 
 #[cargo_test]
@@ -61,15 +60,35 @@ fn adding_and_removing_packages() {
 #[cargo_test]
 fn no_index_update_sparse() {
     let _registry = RegistryBuilder::new().http_index().build();
-    no_index_update();
+    no_index_update(
+        str![[r#"
+[UPDATING] `dummy-registry` index
+[LOCKING] 2 packages to latest compatible versions
+
+"#]],
+        str![[r#"
+[LOCKING] 2 packages to latest compatible versions
+
+"#]],
+    );
 }
 
 #[cargo_test]
 fn no_index_update_git() {
-    no_index_update();
+    no_index_update(
+        str![[r#"
+[UPDATING] `dummy-registry` index
+[LOCKING] 2 packages to latest compatible versions
+
+"#]],
+        str![[r#"
+[LOCKING] 2 packages to latest compatible versions
+
+"#]],
+    );
 }
 
-fn no_index_update() {
+fn no_index_update(expected: impl IntoData, expected_unstable_option: impl IntoData) {
     Package::new("serde", "1.0.0").publish();
 
     let p = project()
@@ -89,22 +108,13 @@ fn no_index_update() {
         .build();
 
     p.cargo("generate-lockfile")
-        .with_stderr(
-            "\
-[UPDATING] `[..]` index
-[LOCKING] 2 packages to latest compatible versions
-",
-        )
+        .with_stderr_data(expected)
         .run();
 
     p.cargo("generate-lockfile -Zno-index-update")
         .masquerade_as_nightly_cargo(&["no-index-update"])
-        .with_stdout("")
-        .with_stderr(
-            "\
-[LOCKING] 2 packages to latest compatible versions
-",
-        )
+        .with_stdout_data("")
+        .with_stderr_data(expected_unstable_option)
         .run();
 }
 
@@ -172,13 +182,13 @@ fn cargo_update_generate_lockfile() {
 
     let lockfile = p.root().join("Cargo.lock");
     assert!(!lockfile.is_file());
-    p.cargo("update").with_stderr("").run();
+    p.cargo("update").with_stderr_data("").run();
     assert!(lockfile.is_file());
 
     fs::remove_file(p.root().join("Cargo.lock")).unwrap();
 
     assert!(!lockfile.is_file());
-    p.cargo("update").with_stderr("").run();
+    p.cargo("update").with_stderr_data("").run();
     assert!(lockfile.is_file());
 }
 
@@ -215,6 +225,7 @@ fn duplicate_entries_in_lockfile() {
             name = "b"
             authors = []
             version = "0.0.1"
+            edition = "2015"
 
             [dependencies]
             common = {path="common"}
@@ -232,11 +243,10 @@ fn duplicate_entries_in_lockfile() {
     // should fail due to a duplicate package `common` in the lock file
     b.cargo("build")
         .with_status(101)
-        .with_stderr_contains(
-            "[..]package collision in the lockfile: packages common [..] and \
-             common [..] are different, but only one can be written to \
-             lockfile unambiguously",
-        )
+        .with_stderr_data(str![[r#"
+[ERROR] package collision in the lockfile: packages common v0.0.1 ([ROOT]/a/common) and common v0.0.1 ([ROOT]/b/common) are different, but only one can be written to lockfile unambiguously
+
+"#]])
         .run();
 }
 
@@ -259,19 +269,17 @@ fn generate_lockfile_holds_lock_and_offline() {
         .build();
 
     p.cargo("generate-lockfile")
-        .with_stderr(
-            "\
-[UPDATING] `[..]` index
+        .with_stderr_data(str![[r#"
+[UPDATING] `dummy-registry` index
 [LOCKING] 2 packages to latest compatible versions
-",
-        )
+
+"#]])
         .run();
 
     p.cargo("generate-lockfile --offline")
-        .with_stderr_contains(
-            "\
+        .with_stderr_data(str![[r#"
 [LOCKING] 2 packages to latest compatible versions
-",
-        )
+
+"#]])
         .run();
 }