From ffe59de494a588ae3770870003f3aed203b18997 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 21 Nov 2024 09:43:51 -0600 Subject: [PATCH] test(overlay): Use snapshot testing --- tests/testsuite/registry_overlay.rs | 51 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/tests/testsuite/registry_overlay.rs b/tests/testsuite/registry_overlay.rs index 65acb8f7ed8..ae55685db2d 100644 --- a/tests/testsuite/registry_overlay.rs +++ b/tests/testsuite/registry_overlay.rs @@ -3,6 +3,7 @@ use cargo_test_support::prelude::*; use cargo_test_support::project; use cargo_test_support::registry::{Package, RegistryBuilder, TestRegistry}; +use cargo_test_support::str; fn setup() -> (TestRegistry, String) { let alt = RegistryBuilder::new().alternative().build(); @@ -77,17 +78,16 @@ fn registry_version_wins() { p.cargo("check") .overlay_registry(®.index_url(), &alt_path) - .with_stderr_data( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `sparse+http://127.0.0.1:[..]/index/` index [LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... -[DOWNLOADED] baz v0.1.1 (registry [..]) +[DOWNLOADED] baz v0.1.1 (registry `sparse+http://127.0.0.1:[..]/index/`) [CHECKING] baz v0.1.1 [CHECKING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -", - ) + +"#]]) .run(); } @@ -120,16 +120,15 @@ fn overlay_version_wins() { p.cargo("check") .overlay_registry(®.index_url(), &alt_path) - .with_stderr_data( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `sparse+http://127.0.0.1:[..]/index/` index [LOCKING] 1 package to latest compatible version -[UNPACKING] baz v0.1.1 (registry [..]) +[UNPACKING] baz v0.1.1 (registry `[ROOT]/alternative-registry`) [CHECKING] baz v0.1.1 [CHECKING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -", - ) + +"#]]) .run(); } @@ -163,18 +162,17 @@ fn version_collision() { p.cargo("check") .overlay_registry(®.index_url(), &alt_path) .with_status(101) - .with_stderr_data( - "\ -[UPDATING] [..] -[ERROR] failed to get `baz` [..] + .with_stderr_data(str![[r#" +[UPDATING] `sparse+http://127.0.0.1:[..]/index/` index +[ERROR] failed to get `baz` as a dependency of package `foo v0.0.1 ([ROOT]/foo)` Caused by: failed to query replaced source registry `crates-io` Caused by: found a package in the remote registry and the local overlay: baz@0.1.1 -", - ) + +"#]]) .run(); } @@ -248,22 +246,21 @@ fn registry_dep_depends_on_new_local_package() { p.cargo("check") .overlay_registry(®.index_url(), &alt_path) - .with_stderr_data( - "\ -[UPDATING] [..] + .with_stderr_data(str![[r#" +[UPDATING] `sparse+http://127.0.0.1:[..]/index/` index [LOCKING] 3 packages to latest compatible versions [ADDING] workspace-package v0.0.1 (available: v0.1.1) [DOWNLOADING] crates ... -[UNPACKING] [..] -[DOWNLOADED] [..] -[DOWNLOADED] [..] +[UNPACKING] workspace-package v0.1.1 (registry `[ROOT]/alternative-registry`) +[DOWNLOADED] registry-package v0.1.0 (registry `sparse+http://127.0.0.1:[..]/index/`) +[DOWNLOADED] workspace-package v0.0.1 (registry `sparse+http://127.0.0.1:[..]/index/`) [CHECKING] workspace-package v0.1.1 [CHECKING] workspace-package v0.0.1 [CHECKING] registry-package v0.1.0 -[CHECKING] foo v0.0.1 [..] +[CHECKING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s -", - ) + +"#]]) .run(); }