test: migrate unit_graph, update and vendor to snapbox #14119

eth3lbert · 2024-06-21T06:34:46Z

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

tests/testsuite/unit_graph.rs
tests/testsuite/update.rs
tests/testsuite/vendor.rs

rustbot · 2024-06-21T06:34:51Z

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-21T07:53:58Z

tests/testsuite/update.rs

-            "\
-error: the argument '--precise <PRECISE>' cannot be used with '--recursive'
+        .with_stderr_data(str![[r#"
+[ERROR] the argument '--precise <PRECISE>' cannot be used with '--recursive'

 Usage: cargo[EXE] update --precise <PRECISE> <SPEC|--package [<SPEC>]>


Consider adding an auto-redaction for cargo[EXE].

Could you expand on why?

If we could redact cargo and cargo.exe to a [CARGO_BIN] that would remove the need for Linux users to add [EXE] at the end when they see CI fail. However, I don't think we can definitively say the bare word cargo should map to CARGO_BIN.

Based on my experience implementing recent PRs, my workflow has been to simply replace the content of deprecated functions and rely on the tests to overwrite them. I then compare the overwritten versions with the originals and make necessary modifications.

However, currently, binary paths on Darwin/Linux platforms lack the [EXE] extension, and you need to add it manually.

I am also fine with appending [EXE] to the binary (including bin:, [EXECUTABLE] , other binaries in ../bin/target, etc.) which should significantly improve the user experience.

Ok, so it was to try to find a way to avoid manually adding [EXE]. I wish there was a way to automate this but I cannot think of one.

eth3lbert · 2024-06-21T07:56:53Z

tests/testsuite/update.rs

+        .with_stderr_data(str![[r#"
+[UPDATING] git repository `[ROOTURL]/rustdns`
 [LOCKING] 3 packages to latest compatible versions
-",
-            git_project.url(),
-        ))
+


Heads up: This remove git_project.url()

eth3lbert · 2024-06-21T07:57:25Z

tests/testsuite/update.rs

+        .with_stderr_data(str![[r#"
+[UPDATING] git repository `[ROOTURL]/rustdns`
 [LOCKING] 3 packages to latest compatible versions
-",
-            git_project.url(),
-        ))
+


Heads up: This remove git_project.url()

eth3lbert · 2024-06-21T07:57:55Z

tests/testsuite/update.rs

+        .with_stderr_data(str![[r#"
+[UPDATING] git repository `[ROOTURL]/rustdns`
 [LOCKING] 3 packages to latest compatible versions
-",
-            git_project.url(),
-        ))
+


Heads up: This remove git_project.url()

eth3lbert · 2024-06-21T07:58:35Z

tests/testsuite/update.rs

            "\
-[UPDATING] git repository `{url}`
-[UPDATING] git v0.5.0 ([..]) -> #{}",
+[UPDATING] git repository `[ROOTURL]/git`


Heads up: This remove url

eth3lbert · 2024-06-21T07:58:51Z

tests/testsuite/update.rs

            "\
-[UPDATING] git repository `{url}`
-[UPDATING] git v0.5.0 ([..]) -> #{short_id}",
+[UPDATING] git repository `[ROOTURL]/git`


Heads up: This remove url

eth3lbert · 2024-06-21T07:59:02Z

tests/testsuite/update.rs

            "\
-[UPDATING] git repository `{url}`
-[UPDATING] git v0.5.0 ([..]) -> #{}",
+[UPDATING] git repository `[ROOTURL]/git`


Heads up: This remove url

eth3lbert · 2024-06-21T07:59:16Z

tests/testsuite/update.rs

            "\
-[UPDATING] git repository `{url}`
-[UPDATING] git v0.5.0 ([..]) -> #{}",
+[UPDATING] git repository `[ROOTURL]/git`


Heads up: This remove url

eth3lbert · 2024-06-21T08:03:50Z

tests/testsuite/vendor.rs

@@ -841,6 +843,7 @@ fn git_complex() {
                    [package]
                    name = "foo"
                    version = "0.1.0"
+                    edition = "2021"


Add a default edition to prevent [WARNING] no edition set: defaulting to the 2015 edition while the latest is 2021.

eth3lbert · 2024-06-21T08:04:11Z

tests/testsuite/vendor.rs

@@ -1087,6 +1103,7 @@ fn config_instructions_works() {
                [package]
                name = "foo"
                version = "0.1.0"
+                edition = "2021"


Add a default edition to prevent [WARNING] no edition set: defaulting to the 2015 edition while the latest is 2021.

eth3lbert · 2024-06-21T08:04:19Z

tests/testsuite/vendor.rs

@@ -1254,6 +1284,7 @@ fn vendor_crate_with_ws_inherit() {
                    [package]
                    name = "foo"
                    version = "0.1.0"
+                    edition = "2021"


Add a default edition to prevent [WARNING] no edition set: defaulting to the 2015 edition while the latest is 2021.

epage · 2024-06-21T15:18:11Z

Thanks!

@bors r+

bors · 2024-06-21T15:18:13Z

📌 Commit f978616 has been approved by epage

It is now in the queue for this repository.

bors · 2024-06-21T15:45:29Z

⌛ Testing commit f978616 with merge ce90393...

bors · 2024-06-21T16:15:21Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing ce90393 to master...

Update cargo 17 commits in 3ed207e416fb2f678a40cc79c02dcf4f936a21ce..bc89bffa5987d4af8f71011c7557119b39e44a65 2024-06-18 19:18:22 +0000 to 2024-06-22 00:36:36 +0000 - test: migrate weak_dep_features, workspaces and yank to snapbox (rust-lang/cargo#14111) - test: migrate features and features(2|_namespaced) to snapbox (rust-lang/cargo#14100) - test: Add auto-redaction for not found error (rust-lang/cargo#14124) - test: migrate build to snapbox (rust-lang/cargo#14068) - test: migrate unit_graph, update and vendor to snapbox (rust-lang/cargo#14119) - fix(test): Un-redact Packaged files (rust-lang/cargo#14123) - test: Auto-redact file number (rust-lang/cargo#14121) - test: migrate lints_table and lints/(mod|unknown_lints) to snapbox (rust-lang/cargo#14104) - Simplify checking feature syntax (rust-lang/cargo#14106) - test: migrate testsuites to snapbox (rust-lang/cargo#14091) - Make `-Cmetadata` consistent across platforms (rust-lang/cargo#14107) - fix(toml): Warn when edition is unuset, even when MSRV is unset (rust-lang/cargo#14110) - Add `CodeFix::apply_solution` and impl `Clone` (rust-lang/cargo#14092) - test: migrate `cargo_alias_config&cargo_config/mod` to snapbox (rust-lang/cargo#14093) - Simplify checking for dependency cycles (rust-lang/cargo#14089) - test: Migrate `pub_priv.rs` to snapshot (rust-lang/cargo#14103) - test: migrate rustdoc and rustdocflags to snapbox (rust-lang/cargo#14098)

test: migrate unit_graph to snapbox

b424c57

rustbot assigned weihanglo Jun 21, 2024

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

eth3lbert force-pushed the snapbox-uuv branch 2 times, most recently from 7d12956 to bf577ac Compare June 21, 2024 07:04

eth3lbert added 2 commits June 21, 2024 15:19

test: migrate update to snapbox

c7c1462

test: migrate vendor to snapbox

f978616

eth3lbert force-pushed the snapbox-uuv branch from bf577ac to f978616 Compare June 21, 2024 07:19

eth3lbert commented Jun 21, 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 Jun 21, 2024

bors merged commit ce90393 into rust-lang:master Jun 21, 2024
22 checks passed

weihanglo mentioned this pull request Jun 21, 2024

Port from bespoke assertions of snapbox #14039

Open

eth3lbert deleted the snapbox-uuv branch June 21, 2024 18:36

weihanglo mentioned this pull request Jun 22, 2024

Update cargo rust-lang/rust#126816

Merged

rustbot added this to the 1.81.0 milestone Jun 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: migrate unit_graph, update and vendor to snapbox #14119

test: migrate unit_graph, update and vendor to snapbox #14119

eth3lbert commented Jun 21, 2024

rustbot commented Jun 21, 2024

eth3lbert Jun 21, 2024

epage Jun 21, 2024

eth3lbert Jun 21, 2024

epage Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

eth3lbert Jun 21, 2024

epage commented Jun 21, 2024

bors commented Jun 21, 2024

bors commented Jun 21, 2024

bors commented Jun 21, 2024

test: migrate unit_graph, update and vendor to snapbox #14119

test: migrate unit_graph, update and vendor to snapbox #14119

Conversation

eth3lbert commented Jun 21, 2024

What does this PR try to resolve?

rustbot commented Jun 21, 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

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

epage commented Jun 21, 2024

bors commented Jun 21, 2024

bors commented Jun 21, 2024

bors commented Jun 21, 2024