test: migrate install* and inheritable_workspace_fields to snapbox #14170

eth3lbert · 2024-06-30T05:48:11Z

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

tests/testsuite/inheritable_workspace_fields.rs
tests/testsuite/install.rs
tests/testsuite/install_upgrade.rs

rustbot · 2024-06-30T05:48:16Z

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

eth3lbert · 2024-06-30T07:55:06Z

tests/testsuite/install.rs

@@ -1429,6 +1385,7 @@ fn use_path_workspace() {
    assert_eq!(lock, lock2, "different lockfiles");
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-30T07:55:46Z

tests/testsuite/install.rs

        // Particularly avoid "Installed package `ws-root v0.1.0 ([..]])` (executable `ws-member`)":
        .with_stderr_does_not_contain("ws-member")
        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-30T07:56:06Z

tests/testsuite/install.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-06-30T08:00:23Z

tests/testsuite/install.rs

+        .with_stderr_data(str![[r#"
+[UPDATING] git repository `[ROOTURL]/foo`
+[ERROR] invalid type: integer `3`, expected a boolean
+ --> home/.cargo/git/checkouts/foo-[HASH]/[..]/Cargo.toml:6:27
+  |
+6 |             incremental = 3
+  |                           ^
+  |
+[ERROR] invalid type: integer `3`, expected a boolean
+ --> home/.cargo/git/checkouts/foo-[HASH]/[..]/Cargo.toml:6:27
+  |
+6 |             incremental = 3
+  |                           ^
+  |
+
+"#]])


I'm not sure if the duplicated error message shown here is correct. Therefore, I'm currently avoiding redacting with glob intentionally.

CI passes so yeah keep it.

weihanglo · 2024-07-03T21:59:58Z

tests/testsuite/install.rs

-        .with_stderr(
-            "\
-[UPDATING] `[..]` index
+        .with_stderr_data(str![[r#"


Could we allow deprecated for all --message-format=json tests?
The snapshot is hard to read and review so we don't want to do it now.

Absolutely! That makes things a lot easier, to be honest. 😅

weihanglo · 2024-07-03T22:03:50Z

tests/testsuite/install.rs

-        .with_stderr_contains("[INSTALLING] bar v0.0.1")
-        .with_stderr_contains("[..]--target nonexistent[..]")
+        .with_stderr_data(str![[r#"
+...


[INSTALLING] bar v0.0.1 is missing, though I think that is fine.

I'll double-check this and re-add it.

weihanglo · 2024-07-03T22:06:00Z

tests/testsuite/install.rs

+        .with_stderr_data(str![[r#"
+[UPDATING] git repository `[ROOTURL]/foo`
+[ERROR] invalid type: integer `3`, expected a boolean
+ --> home/.cargo/git/checkouts/foo-[HASH]/[..]/Cargo.toml:6:27
+  |
+6 |             incremental = 3
+  |                           ^
+  |
+[ERROR] invalid type: integer `3`, expected a boolean
+ --> home/.cargo/git/checkouts/foo-[HASH]/[..]/Cargo.toml:6:27
+  |
+6 |             incremental = 3
+  |                           ^
+  |
+
+"#]])


CI passes so yeah keep it.

eth3lbert · 2024-07-03T22:56:46Z

Feedback addressed! Thanks!

weihanglo · 2024-07-04T20:56:11Z

Thanks!

@bors r+

bors · 2024-07-04T20:56:13Z

📌 Commit 43ad0ac has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-07-04T20:57:19Z

⌛ Testing commit 43ad0ac with merge 1e49698...

bors · 2024-07-04T21:29:34Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 1e49698 to master...

Update cargo 13 commits in a515d463427b3912ec0365d106791f88c1c14e1b..f86ce56396168edf5d0e1c412ddda0b2edba7d46 2024-07-02 20:53:36 +0000 to 2024-07-05 17:52:05 +0000 - test: Migrate jobserver to snapbox (rust-lang/cargo#14191) - chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186) - test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193) - test: migrate cfg and check to snapbox (rust-lang/cargo#14185) - test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170) - Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900) - test: Migrate network tests to snapbox (rust-lang/cargo#14187) - test: migrate some files to snapbox (rust-lang/cargo#14113) - test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161) - chore: fix some typos (rust-lang/cargo#14182) - fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026) - test：migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171) - test: Migrate git_auth to snapbox (rust-lang/cargo#14172)

Update cargo 20 commits in a515d463427b3912ec0365d106791f88c1c14e1b..154fdac39ae9629954e19e9986fd2cf2cdd8d964 2024-07-02 20:53:36 +0000 to 2024-07-07 01:28:23 +0000 - test: relax redactions for rust-lang/rust (rust-lang/cargo#14203) - use "bootstrap" instead of "rustbuild" (rust-lang/cargo#14207) - test: migrate serveral files to snapbox (rust-lang/cargo#14180) - Add rustdocflags to Unit's Debug impl (rust-lang/cargo#14201) - Allow enabling `config-include` feature in config (rust-lang/cargo#14196) - fix(test): Restore `does_not_contain` for check (rust-lang/cargo#14198) - test: migrate patch, pkgid, proc_macro and progress to snapbox (rust-lang/cargo#14181) - test: Migrate jobserver to snapbox (rust-lang/cargo#14191) - chore(deps): update msrv (3 versions) to v1.77 (rust-lang/cargo#14186) - test: migrate build_plan and build_script to snapbox (rust-lang/cargo#14193) - test: migrate cfg and check to snapbox (rust-lang/cargo#14185) - test: migrate install* and inheritable_workspace_fields to snapbox (rust-lang/cargo#14170) - Pass rustflags to artifacts built with implicit targets when using target-applies-to-host (rust-lang/cargo#13900) - test: Migrate network tests to snapbox (rust-lang/cargo#14187) - test: migrate some files to snapbox (rust-lang/cargo#14113) - test: Auto-redact `... after last build at ...`; Migrate `freshness` to Snapbox (rust-lang/cargo#14161) - chore: fix some typos (rust-lang/cargo#14182) - fix: improve message for inactive weak optional feature with edition2024 through unused dep collection (rust-lang/cargo#14026) - test：migrate `doc/directory/docscrape` to snapbox (rust-lang/cargo#14171) - test: Migrate git_auth to snapbox (rust-lang/cargo#14172)

rustbot assigned weihanglo Jun 30, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 30, 2024

eth3lbert force-pushed the snapbox-i branch 4 times, most recently from c27d3f9 to a6a587f Compare June 30, 2024 07:22

eth3lbert commented Jun 30, 2024

View reviewed changes

weihanglo mentioned this pull request Jun 30, 2024

Port from bespoke assertions of snapbox #14039

Closed

weihanglo reviewed Jul 3, 2024

View reviewed changes

eth3lbert added 3 commits July 4, 2024 06:16

test: migrate inheritable_workspace_fields to snapbox

fceb9d3

test: migrate install to snapbox

8668494

test: migrate install_upgrade to snapbox

43ad0ac

eth3lbert force-pushed the snapbox-i branch from a6a587f to 43ad0ac Compare July 3, 2024 22:28

weihanglo approved these changes Jul 4, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 4, 2024

bors merged commit 1e49698 into rust-lang:master Jul 4, 2024
22 checks passed

eth3lbert deleted the snapbox-i branch July 4, 2024 21:38

weihanglo mentioned this pull request Jul 5, 2024

Update cargo rust-lang/rust#127385

Merged

rustbot added this to the 1.81.0 milestone Jul 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: migrate install* and inheritable_workspace_fields to snapbox #14170

test: migrate install* and inheritable_workspace_fields to snapbox #14170

eth3lbert commented Jun 30, 2024

rustbot commented Jun 30, 2024

eth3lbert Jun 30, 2024

eth3lbert Jun 30, 2024

eth3lbert Jun 30, 2024

eth3lbert Jun 30, 2024

weihanglo Jul 3, 2024

weihanglo Jul 3, 2024

eth3lbert Jul 3, 2024

weihanglo Jul 3, 2024

eth3lbert Jul 3, 2024

weihanglo Jul 3, 2024

eth3lbert commented Jul 3, 2024

weihanglo commented Jul 4, 2024

bors commented Jul 4, 2024

bors commented Jul 4, 2024

bors commented Jul 4, 2024

test: migrate install* and inheritable_workspace_fields to snapbox #14170

test: migrate install* and inheritable_workspace_fields to snapbox #14170

Conversation

eth3lbert commented Jun 30, 2024

What does this PR try to resolve?

rustbot commented Jun 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eth3lbert commented Jul 3, 2024

weihanglo commented Jul 4, 2024

bors commented Jul 4, 2024

bors commented Jul 4, 2024

bors commented Jul 4, 2024