test: Migrate some files to snapbox #14069

heisen-li · 2024-06-14T03:40:44Z

What does this PR try to resolve?

This PR addresses the migration of the following files:

tests/testsuite/build_script_extra_link_arg.rs
tests/testsuite/cache_lock.rs
tests/testsuite/cache_messages.rs

rustbot · 2024-06-14T03:40:49Z

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

tests/testsuite/build_script_extra_link_arg.rs

heisen-li · 2024-06-14T06:48:44Z

tests/testsuite/build_script_extra_link_arg.rs

+[FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[DOCTEST] foo
+[RUNNING] `rustdoc [..]--crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]
+[ERROR] doctest failed, to rerun pass `--doc`


CI failed, but my local was a success.

tests/testsuite/build_script_extra_link_arg.rs

heisen-li · 2024-06-14T06:59:56Z

tests/testsuite/cache_messages.rs

 ",
            expected
        ))
        .run();
 }

+#[allow(deprecated)]


On account ofwith_stderr_does_not_contain()，added #[allow(deprecated)].

It seems like we can just assert stdout with str![] to replace with_stderr_does_not_contain here. They should be all empty except the very first invocation.

And we can add str! for each with_stderr_data.

You're right. The first one looks empty too.

Sorry. FOund that I was wrong 🤦🏾‍♂️. WRAPPER CALLED: might be matched by ... wild card. We should keep with_stderr_does_not_contain. Maybe make the literal shorter so it won't accidentally mismatch in the future? Like with_stderr_does_not_contain("WRAPPER CALLED: [..])?

heisen-li · 2024-06-14T07:00:11Z

tests/testsuite/cache_messages.rs

        .with_stdout_does_not_contain(
            "WRAPPER CALLED: rustc --crate-name foo --edition=2015 src/lib.rs [..]",
        )
        .run();
 }

+#[allow(deprecated)]


On account ofwith_stderr_does_not_contain()，added #[allow(deprecated)].

tests/testsuite/build_script_extra_link_arg.rs

weihanglo · 2024-06-17T03:19:03Z

tests/testsuite/cache_messages.rs

@@ -160,7 +159,17 @@ fn clears_cache_after_fix() {
    // Make sure the cache is invalidated when there is no output.
    let p = project().file("src/lib.rs", "fn asdf() {}").build();
    // Fill the cache.
-    p.cargo("check").with_stderr_contains("[..]asdf[..]").run();
+    p.cargo("check")
+        .with_stderr_data(


While rustc invocation is omitted, I believe we can still wrap it with str![].

Thanks, it has been modified.

BTW: Sorry, I'm a bit confused now, what are the criteria for using or not using str![]?

See #14039 "4. Resolve non-literal deprecations".

To me, I try porting all of the with str![] unless it is too specific, fragile, or hard to model with str![].

tests/testsuite/cache_messages.rs

weihanglo · 2024-06-17T13:09:49Z

tests/testsuite/cache_messages.rs

+            "\
+[FRESH] foo v0.0.1 ([ROOT]/foo)
+WRAPPER CALLED: rustc [..]
+...


This is not necessary and can be wrapped with str![]

Suggested change

...

weihanglo · 2024-06-17T13:14:44Z

tests/testsuite/cache_messages.rs

 ",
            expected
        ))
        .run();
 }

+#[allow(deprecated)]


It seems like we can just assert stdout with str![] to replace with_stderr_does_not_contain here. They should be all empty except the very first invocation.

And we can add str! for each with_stderr_data.

weihanglo · 2024-06-18T16:56:23Z

Thanks. Looks good.

@bors r+

bors · 2024-06-18T16:56:25Z

📌 Commit 2e1f7b4 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-06-18T16:57:32Z

⌛ Testing commit 2e1f7b4 with merge b2739ba...

bors · 2024-06-18T17:35:42Z

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

Update cargo 13 commits in a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726e..3ed207e416fb2f678a40cc79c02dcf4f936a21ce 2024-06-15 01:10:07 +0000 to 2024-06-18 19:18:22 +0000 - test: prefer raw string for regex reduction (rust-lang/cargo#14099) - test: migrate tree and tree_graph_features to snapbox (rust-lang/cargo#14094) - test: Migrate some files to snapbox (rust-lang/cargo#14069) - remove some legacy public dependency code from the resolver (rust-lang/cargo#14090) - fix(fix): Address problems with implicit -> explicit feature migration (rust-lang/cargo#14018) - refactor: 1.79 cleanup (rust-lang/cargo#14088) - test: migrate `git_(gc|shallow)` to snapbox (rust-lang/cargo#14087) - test: migrate timings_works to snapbox (rust-lang/cargo#14082) - test: migrate minimal_versions to snapbox (rust-lang/cargo#14080) - Remove `run_expect_error` to avoid tests incorrectly passing (rust-lang/cargo#14078) - test: migrate help to snapbox (rust-lang/cargo#14060) - test: Migrate tests/testsuite/co*.rs to snapbox (rust-lang/cargo#14079) - Use `std::fs::absolute` instead of reimplementing it (rust-lang/cargo#14075)

rustbot assigned ehuss Jun 14, 2024

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

heisen-li commented Jun 14, 2024

View reviewed changes

heisen-li force-pushed the build_script_extra branch from 0d255dd to 0f4f256 Compare June 15, 2024 08:31

weihanglo reviewed Jun 17, 2024

View reviewed changes

test: migrate build_script_extra_link_arg to snapbox

e41c718

heisen-li force-pushed the build_script_extra branch 2 times, most recently from 05cfed0 to b0f4c94 Compare June 17, 2024 11:54

weihanglo reviewed Jun 17, 2024

View reviewed changes

heisen-li force-pushed the build_script_extra branch from b0f4c94 to ebb795c Compare June 18, 2024 02:05

heisen-li added 2 commits June 18, 2024 18:59

test: migrate cache_message to snapbox

413844b

test: migrate cache_lock to snapbox

2e1f7b4

heisen-li force-pushed the build_script_extra branch from ebb795c to 2e1f7b4 Compare June 18, 2024 11:00

weihanglo mentioned this pull request Jun 18, 2024

Port from bespoke assertions of snapbox #14039

Open

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

bors merged commit b2739ba into rust-lang:master Jun 18, 2024
22 checks passed

weihanglo mentioned this pull request Jun 19, 2024

Update cargo rust-lang/rust#126657

Merged

rustbot added this to the 1.81.0 milestone Jun 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: Migrate some files to snapbox #14069

test: Migrate some files to snapbox #14069

heisen-li commented Jun 14, 2024

rustbot commented Jun 14, 2024

heisen-li Jun 14, 2024

heisen-li Jun 14, 2024

weihanglo Jun 17, 2024

heisen-li Jun 18, 2024

weihanglo Jun 18, 2024

heisen-li Jun 14, 2024

weihanglo Jun 17, 2024

heisen-li Jun 17, 2024

weihanglo Jun 17, 2024

weihanglo Jun 17, 2024

weihanglo Jun 17, 2024

weihanglo commented Jun 18, 2024

bors commented Jun 18, 2024

bors commented Jun 18, 2024

bors commented Jun 18, 2024

test: Migrate some files to snapbox #14069

test: Migrate some files to snapbox #14069

Conversation

heisen-li commented Jun 14, 2024

What does this PR try to resolve?

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

weihanglo commented Jun 18, 2024

bors commented Jun 18, 2024

bors commented Jun 18, 2024

bors commented Jun 18, 2024