test: migrate testsuites to snapbox #14091

henry40408 · 2024-06-17T22:29:18Z

What does this PR try to resolve?

Part of #14039.

Migrate the following testsuites to snapbox:

tests/testsuite/death.rs
~~tests/testsuite/locate_project.rs~~ see test: migrate testsuites to snapbox #14091 (comment)
tests/testsuite/message_format.rs
tests/testsuite/precise_pre_release.rs
tests/testsuite/verify_project.rs
tests/testsuite/version.rs

How should we test and review this PR?

N/A

Additional information

N/A

rustbot · 2024-06-17T22:29:22Z

r? @epage

rustbot has assigned @epage.
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

henry40408 · 2024-06-17T22:29:49Z

r? @weihanglo

tests/testsuite/locate_project.rs

Rustin170506 · 2024-06-18T12:49:40Z

tests/testsuite/message_format.rs

@@ -108,7 +113,13 @@ fn cargo_renders_ansi() {

    p.cargo("check --message-format json-diagnostic-rendered-ansi")
        .with_status(101)
-        .with_stdout_contains("[..]\\u001b[38;5;9merror[..]")
+        .with_stdout_data(str![[r#"
+{"reason":"compiler-message","package_id":"path+[ROOTURL]/foo#0.1.0","manifest_path":"[..]","target":{"kind":["bin"],"crate_types":["bin"],"name":"foo","src_path":"[..]","edition":"2015","doc":true,"doctest":false,"test":true},"message":{"$message_type":"diagnostic","message":"`main` function not found in crate `foo`","code":{"code":"E0601","explanation":"No `main` function was found in a binary crate./n/nTo fix this error, add a `main` function:/n/n```/nfn main() {/n    // Your program will start here./n    println!(/"Hello world!/");/n}/n```/n/nIf you don't know the basics of Rust, you can look at the/n[Rust Book][rust-book] to get started./n/n[rust-book]: https://doc.rust-lang.org/book//n"},"level":"error","spans":[{"file_name":"src/main.rs","byte_start":0,"byte_end":0,"line_start":0,"line_end":0,"column_start":1,"column_end":1,"is_primary":true,"text":[],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"consider adding a `main` function to `src/main.rs`","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"/u001b[0m/u001b[1m/u001b[38;5;9merror[E0601]/u001b[0m/u001b[0m/u001b[1m: `main` function not found in crate `foo`/u001b[0m/n/u001b[0m  /u001b[0m/u001b[0m/u001b[1m/u001b[38;5;12m|/u001b[0m/n/u001b[0m  /u001b[0m/u001b[0m/u001b[1m/u001b[38;5;12m= /u001b[0m/u001b[0m/u001b[1mnote/u001b[0m/u001b[0m: consider adding a `main` function to `src/main.rs`/u001b[0m/n/n"}}


I guess we only need to check \\u001b[38;5;9merror here?

tests/testsuite/locate_project.rs

weihanglo · 2024-06-18T17:08:36Z

tests/testsuite/locate_project.rs

-    let outer_manifest = r#"{"root": "[ROOT]/foo/Cargo.toml"}"#;
-    let inner_manifest = r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#;


Guess it's also possible to do something alike? By extracting them as variables, we can make sure invocations that are ought to be the same still get the same JSON.

Suggested change

let outer_manifest = r#"{"root": "[ROOT]/foo/Cargo.toml"}"#;

let inner_manifest = r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#;

let outer_manifest = str![[r#"{"root": "[ROOT]/foo/Cargo.toml"}"#]];

let inner_manifest = str![[r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#]];

It appears the suggested change might have a typo

let inner_manifest = str![[r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#]];

tests/testsuite/message_format.rs

tests/testsuite/version.rs

rust-lang#14091 (comment)

weihanglo

Thanks. Just one thing left and we're ready to go.

tests/testsuite/version.rs

henry40408 · 2024-06-19T16:08:24Z

I'll tidy up commits after CI passes.

This reverts commit 2fbba53.

henry40408 · 2024-06-20T13:23:09Z

@weihanglo I've finished arranging the commits.

weihanglo · 2024-06-20T13:38:37Z

Thanks!

@bors r+

bors · 2024-06-20T13:38:40Z

📌 Commit 2c517d9 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-06-20T13:39:48Z

⌛ Testing commit 2c517d9 with merge 96fc12c...

bors · 2024-06-20T14:07:39Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 96fc12c 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)

rustbot assigned epage Jun 17, 2024

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

rustbot assigned weihanglo and unassigned epage Jun 17, 2024

henry40408 force-pushed the issue-14039 branch 6 times, most recently from ef8e59e to 20768f7 Compare June 18, 2024 12:33

Rustin170506 reviewed Jun 18, 2024

View reviewed changes

henry40408 force-pushed the issue-14039 branch 2 times, most recently from ac227e0 to ba19274 Compare June 18, 2024 13:36

weihanglo mentioned this pull request Jun 18, 2024

Port from bespoke assertions of snapbox #14039

Closed

weihanglo reviewed Jun 18, 2024

View reviewed changes

henry40408 force-pushed the issue-14039 branch from 6ec501f to 2fbba53 Compare June 19, 2024 12:32

henry40408 added a commit to henry40408/cargo that referenced this pull request Jun 19, 2024

test: mark test cases in testsuite locate_project and move on

09fe7b8

rust-lang#14091 (comment)

weihanglo reviewed Jun 19, 2024

View reviewed changes

tests/testsuite/version.rs Outdated Show resolved Hide resolved

weihanglo mentioned this pull request Jun 20, 2024

test: migrate clean to snapbox #14096

Merged

henry40408 added 5 commits June 20, 2024 19:59

test: remove deprecated attribute from testsuite death

a67f4ed

test: migrate testsuite message_format to snapbox

efbcbb0

This reverts commit 2fbba53.

test: migrate testsuite precise_pre_release to snapbox

d602434

test: migrate testsuite verify_project to snapbox

1e0dca3

test: migrate testsuite version to snapbox

2c517d9

henry40408 force-pushed the issue-14039 branch from 842579e to 2c517d9 Compare June 20, 2024 12:05

weihanglo approved these changes Jun 20, 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 20, 2024

bors merged commit 96fc12c into rust-lang:master Jun 20, 2024
22 checks passed

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 testsuites to snapbox #14091

test: migrate testsuites to snapbox #14091

henry40408 commented Jun 17, 2024 •

edited

Loading

rustbot commented Jun 17, 2024

henry40408 commented Jun 17, 2024

Rustin170506 Jun 18, 2024

weihanglo Jun 18, 2024 •

edited

Loading

eth3lbert Jun 19, 2024

weihanglo left a comment

henry40408 commented Jun 19, 2024

henry40408 commented Jun 20, 2024

weihanglo commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

		let outer_manifest = r#"{"root": "[ROOT]/foo/Cargo.toml"}"#;
		let inner_manifest = r#"{"root": "[ROOT]/foo/inner/Cargo.toml"}"#;

test: migrate testsuites to snapbox #14091

test: migrate testsuites to snapbox #14091

Conversation

henry40408 commented Jun 17, 2024 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Jun 17, 2024

henry40408 commented Jun 17, 2024

Rustin170506 Jun 18, 2024

Choose a reason for hiding this comment

weihanglo Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

eth3lbert Jun 19, 2024

Choose a reason for hiding this comment

weihanglo left a comment

Choose a reason for hiding this comment

henry40408 commented Jun 19, 2024

henry40408 commented Jun 20, 2024

weihanglo commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

henry40408 commented Jun 17, 2024 •

edited

Loading

weihanglo Jun 18, 2024 •

edited

Loading