test: migrate some files to snapbox #14113

heisen-li · 2024-06-20T11:51:43Z

What does this PR try to resolve?

Changes to the following documents were completed:

tests/testsuite/cargo_command.rs
tests/testsuite/cargo_env_config.rs
tests/testsuite/cargo_features.rs
tests/testsuite/cargo_targets.rs

part of #14039

rustbot · 2024-06-20T11:51:47Z

r? @ehuss

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

heisen-li · 2024-06-20T12:10:13Z

tests/testsuite/cargo_command.rs

-}
-
-#[cargo_test]
-fn list_builtin_aliases_with_descriptions() {


Since the output on the right is complete, the test case here is deleted.

heisen-li · 2024-06-20T12:11:23Z

tests/testsuite/cargo_command.rs

@@ -132,6 +178,7 @@ fn list_command_looks_at_path_case_mismatch() {
    );
 }

+#[allow(deprecated)]


Since with_stdout_does_not_contain，add #[allow(deprecated)].

tests/testsuite/cargo_env_config.rs

crates/cargo-test-support/src/compare.rs

bors · 2024-06-23T03:56:31Z

☔ The latest upstream changes (presumably #14126) made this pull request unmergeable. Please resolve the merge conflicts.

crates/cargo-test-support/src/compare.rs

tests/testsuite/cargo_command.rs

epage · 2024-06-26T00:20:01Z

Could you clean up the commit history?

epage · 2024-06-26T00:23:50Z

tests/testsuite/cargo_command.rs

+        .with_stdout_data(str![[r#"
+[CARGO_PATH]
+
+"#]])


So this was already a "self updating" test output and I believe the design of it means that there is little to evolve that we'd need to allow snapshotting more from this.

Should we keep the expected-str generation that was in here before, just switching the assert method used?

It is not possible to just convert with_stdout to with_stdout_data, such as the error reported below:

--- Expected ++++ actual: stdout 1 - /home/heisen/temp/temp/temp/cargo/target/debug/cargo∅ 1 + /home/heisen/temp/temp/temp/cargo/target/debug/cargo

Need to add line breaks.

Adding in a newline is trivial and doesn't invalidate the idea I mentioned that this is unlikely to have surrounding text that gets regularly changed.

It has been modified and you can see if it meets the requirements.

tests/testsuite/version.rs

tests/testsuite/cargo_command.rs

weihanglo · 2024-07-01T16:08:17Z

tests/testsuite/cargo_command.rs

-            [cargo-new]
-            vcs = "none"
-        "#,
+			[cargo-new]


Why whitespaces changes?

Ditto. It's normal in my local area.

weihanglo · 2024-07-01T16:09:39Z

tests/testsuite/cargo_command.rs

    let mut path = path();
    path.push(target_dir.clone());
    let path = env::join_paths(path.iter()).unwrap();

    cargo_process("envtest")
        .env("PATH", &path)
-        .with_stdout(cargo.to_str().unwrap())
+        .with_stdout_data(str![[r#"


This asserts an exact value. I don't think we need a snapshot here.

Suggested change

.with_stdout_data(str![[r#"

.with_stdout_data(cargo.to_str())

Sorry, this modification doesn't work, I tried several different modification options and got different results. I would like to describe it in detail:
1.Try modifying it to：.with_stdout_data(cargo.to_str().unwrap());
The results obtained are：

--- Expected ++++ actual: stdout 1 - /home/heisen/temp/temp/temp/cargo/target/debug/cargo∅ 1 + /home/heisen/temp/temp/temp/cargo/target/debug/cargo

Line breaks need to be added. If line breaks are added after: .with_stdout_data(format!("{}\n",cargo.to_str().unwrap()), then the suffix [EXE] needs to be handled. If [EXE] is added, then an error occurs:

--- Expected ++++ actual: stdout 1 - \\?\D:\Rust\temp\temp\temp\cargo\target\debug\cargo.exe[EXE] 1 + //?/D:/Rust/temp/temp/temp/cargo/target/debug/cargo[EXE]

2.Try changing it to .with_stdout_data(cargo.to_str()); it gives an error:

error[E0277]: the trait bound `std::option::Option<&str>: snapbox::IntoData` is not satisfied

Trying to change to .with_stdout_data(envtest_bin) in the following will result in an error:

--- Expected ++++ actual: stdout 1 - \\?\D:\Rust\temp\temp\temp\cargo\target\tmp\cit\t0\cargo-envtest\target\debug\cargo-envtest.exe∅ 1 + //?/[ROOT]/cargo-envtest/target/debug/cargo-envtest[EXE]

All I can think of at the moment is to use the current modification or add #[allow(deprecated)].

weihanglo · 2024-07-01T16:10:39Z

tests/testsuite/cargo_command.rs

@@ -385,7 +405,10 @@ fn cargo_subcommand_env() {
    cargo_process("envtest")
        .env("PATH", &path)
        .env(cargo::CARGO_ENV, &envtest_bin)
-        .with_stdout(envtest_bin)
+        .with_stdout_data(str![[r#"


ditto. Just check the value against envtest_bin.

tests/testsuite/cargo_command.rs

weihanglo · 2024-07-03T21:56:10Z

tests/testsuite/cargo_command.rs

@@ -341,6 +357,7 @@ fn override_cargo_home() {
    assert!(paths::root().join("foo2/.git").is_dir());
 }

+#[allow(deprecated)]


Note: #14113 (comment)

weihanglo · 2024-07-03T21:56:24Z

Looks good. Thanks!

@bors r+

bors · 2024-07-03T21:56:26Z

📌 Commit a32be92 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-07-03T22:21:27Z

⌛ Testing commit a32be92 with merge d1b5f07...

bors · 2024-07-03T22:50:48Z

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

rustbot assigned ehuss Jun 20, 2024

rustbot added A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 20, 2024

heisen-li force-pushed the env_features_target branch from 1bf5eea to f7b0fac Compare June 20, 2024 12:08

heisen-li commented Jun 20, 2024

View reviewed changes

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

heisen-li force-pushed the env_features_target branch from f7b0fac to 7c172ec Compare June 20, 2024 12:29

weihanglo mentioned this pull request Jun 20, 2024

Port from bespoke assertions of snapbox #14039

Open

heisen-li force-pushed the env_features_target branch 3 times, most recently from cd4aa8c to 464d232 Compare June 21, 2024 06:48

epage reviewed Jun 21, 2024

View reviewed changes

crates/cargo-test-support/src/compare.rs Outdated Show resolved Hide resolved

epage reviewed Jun 21, 2024

View reviewed changes

crates/cargo-test-support/src/compare.rs Outdated Show resolved Hide resolved

heisen-li commented Jun 24, 2024

View reviewed changes

crates/cargo-test-support/src/compare.rs Outdated Show resolved Hide resolved

crates/cargo-test-support/src/compare.rs Outdated Show resolved Hide resolved

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

epage reviewed Jun 26, 2024

View reviewed changes

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

heisen-li added 3 commits June 26, 2024 12:22

test: migrate cargo_env_config to snapbox

8c6c8a1

test: migrate cargo_target to snapbox

0708802

test: migrate cargo_features to snapbox

09ba4f3

heisen-li force-pushed the env_features_target branch 6 times, most recently from 204d05d to c335fb0 Compare June 29, 2024 10:40

weihanglo reviewed Jul 1, 2024

View reviewed changes

heisen-li force-pushed the env_features_target branch from c335fb0 to 7dc6253 Compare July 2, 2024 03:26

heisen-li force-pushed the env_features_target branch from 7dc6253 to 1b90556 Compare July 2, 2024 03:47

ehuss assigned weihanglo and unassigned ehuss Jul 2, 2024

test: migrate cargo_command to snapbox

a32be92

heisen-li force-pushed the env_features_target branch from 1b90556 to a32be92 Compare July 3, 2024 02:17

weihanglo approved these changes Jul 3, 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 3, 2024

bors merged commit d1b5f07 into rust-lang:master Jul 3, 2024
22 checks passed

heisen-li deleted the env_features_target branch July 4, 2024 01:42

weihanglo mentioned this pull request Jul 5, 2024

Update cargo rust-lang/rust#127385

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: migrate some files to snapbox #14113

test: migrate some files to snapbox #14113

heisen-li commented Jun 20, 2024

rustbot commented Jun 20, 2024

heisen-li Jun 20, 2024

heisen-li Jun 20, 2024

bors commented Jun 23, 2024

epage commented Jun 26, 2024

epage Jun 26, 2024

heisen-li Jun 26, 2024 •

edited

Loading

epage Jun 26, 2024

heisen-li Jun 29, 2024

weihanglo Jul 1, 2024

heisen-li Jul 2, 2024

weihanglo Jul 1, 2024

heisen-li Jul 2, 2024

weihanglo Jul 1, 2024

weihanglo Jul 3, 2024

weihanglo commented Jul 3, 2024

bors commented Jul 3, 2024

bors commented Jul 3, 2024

bors commented Jul 3, 2024

	.with_stdout_data(str![[r#"
	.with_stdout_data(cargo.to_str())

test: migrate some files to snapbox #14113

test: migrate some files to snapbox #14113

Conversation

heisen-li commented Jun 20, 2024

What does this PR try to resolve?

rustbot commented Jun 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jun 23, 2024

epage commented Jun 26, 2024

Choose a reason for hiding this comment

heisen-li Jun 26, 2024 • edited Loading

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

weihanglo commented Jul 3, 2024

bors commented Jul 3, 2024

bors commented Jul 3, 2024

bors commented Jul 3, 2024

heisen-li Jun 26, 2024 •

edited

Loading