test: migrate test to snapbox by eth3lbert · Pull Request #14226 · rust-lang/cargo

eth3lbert · 2024-07-10T00:53:28Z

What does this PR try to resolve?

Part of #14039.

Migrate following to snapbox:

tests/testsuite/test.rs

rustbot · 2024-07-10T00:53:33Z

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

eth3lbert · 2024-07-10T00:54:20Z

r? @epage

epage · 2024-07-10T01:16:21Z

tests/testsuite/test.rs

+        //         .with_stdout_data(str![[r#"
+        // running 0 tests
+        // test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in [ELAPSED]s
+        // test sub_one_test ... ok
+        // test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in [ELAPSED]s
+        // test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in [ELAPSED]s
+        // ...
+        // "#]].unordered())


Whats up with this?

Oops! I forgot to clean up!

epage · 2024-07-10T01:17:54Z

tests/testsuite/test.rs

+        .with_stderr_data(
+            str![[r#"
+[RUNNING] `rustc [..]myexm1.rs [..]--crate-type bin[..]`
+[RUNNING] `rustc [..]myexm2.rs [..]--test[..]`
+...
+"#]]
+            .unordered(),
+        )
        .with_stderr_does_not_contain("[RUNNING] [..]myexm1-[..]")


Let's revert this

eth3lbert · 2024-07-10T01:48:18Z

Since this is likely still under review, I'll address the feedback with a series of follow-up fixup commits and then rebase with squash.

epage · 2024-07-10T01:50:48Z

Feel free to squash

tests/testsuite/test.rs

eth3lbert · 2024-07-10T02:04:27Z

tests/testsuite/test.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-07-10T02:05:48Z

tests/testsuite/test.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-07-10T02:06:19Z

tests/testsuite/test.rs

        .run();
 }

+#[allow(deprecated)]


with_stdout_does_not_contain is being used in this function.

eth3lbert · 2024-07-10T02:06:40Z

tests/testsuite/test.rs

@@ -3355,6 +3644,7 @@ fn test_virtual_manifest_one_project() {
        .run();
 }

+#[allow(deprecated)]


with_stdout_does_not_contain is being used in this function.

eth3lbert · 2024-07-10T02:14:48Z

tests/testsuite/test.rs

@@ -3585,6 +3897,7 @@ fn doctest_and_registry() {
    p.cargo("test --workspace -v").run();
 }

+#[allow(deprecated)]


This seems similar to #14113 (comment)

I'm keeping this since it failed in CI:
https://github.com/rust-lang/cargo/actions/runs/9866499136/job/27245347236?pr=14226#step:11:4052

--- Expected ++++ actual: stderr 1 - ... 2 - \\?\D:\a\cargo\cargo\target\debug\cargo.exe 3 - ... 1 + [COMPILING] foo v0.5.0 ([ROOT]/foo) 2 + [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s 3 + [RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) 4 + //?/D:/a/cargo/cargo/target/debug/cargo[EXE]

and
https://github.com/rust-lang/cargo/actions/runs/9866874620/job/27246366772?pr=14226#step:11:4053

--- Expected ++++ actual: stderr 1 - ... 2 - \\?\C:\Users\runneradmin\.cargo\bin\rustc.exe 3 - ... 1 + [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s 2 + [RUNNING] unittests src/lib.rs (target/debug/deps/foo-[HASH][EXE]) 3 + //?/C:/Users/runneradmin/.cargo/bin/rustc[EXE]

eth3lbert · 2024-07-10T02:16:18Z

tests/testsuite/test.rs

        .with_status(101)
        .run();
 }

+#[allow(deprecated)]


with_json is being used in this function.

eth3lbert · 2024-07-10T02:16:32Z

tests/testsuite/test.rs

@@ -4079,6 +4419,7 @@ fn json_artifact_includes_test_flag() {
        .run();
 }

+#[allow(deprecated)]


with_json is being used in this function.

eth3lbert · 2024-07-10T02:16:50Z

tests/testsuite/test.rs

@@ -4116,6 +4457,7 @@ fn json_artifact_includes_executable_for_library_tests() {
        .run();
 }

+#[allow(deprecated)]


with_json is being used in this function.

eth3lbert · 2024-07-10T02:17:25Z

tests/testsuite/test.rs

        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

eth3lbert · 2024-07-10T02:17:52Z

tests/testsuite/test.rs

        .with_status(101)
        .run();
 }

+#[allow(deprecated)]


with_stderr_does_not_contain is being used in this function.

epage · 2024-07-10T13:53:01Z

@bors r+

bors · 2024-07-10T13:53:03Z

📌 Commit b3b814e has been approved by epage

It is now in the queue for this repository.

bors · 2024-07-10T13:54:11Z

⌛ Testing commit b3b814e with merge 4e19f31...

bors · 2024-07-10T14:21:43Z

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

Update cargo 31 commits in 154fdac39ae9629954e19e9986fd2cf2cdd8d964..a2b58c3dad4d554ba01ed6c45c41ff85390560f2 2024-07-07 01:28:23 +0000 to 2024-07-16 00:52:02 +0000 - chore(ci): bump CI tools (rust-lang/cargo#14257) - test: migrate fetch and list_availables to snapbox (rust-lang/cargo#14214) - chore: downgrade to jobserver@0.1.28 (rust-lang/cargo#14254) - perf(source): Don't `du` on every git source load (rust-lang/cargo#14252) - fix(source): Don't warn about unreferenced duplicate packages (rust-lang/cargo#14239) - feat(test): Add cargo_test to test-support prelude (rust-lang/cargo#14243) - Add workflow to publish Cargo automatically (rust-lang/cargo#14202) - test: migrate implicit_features to snapbox (rust-lang/cargo#14245) - test: migrate build-std/main to snapbox (rust-lang/cargo#14241) - test: migrate check_cfg to snapbox (rust-lang/cargo#14235) - refactor(source): More RecursivePathSource clean up (rust-lang/cargo#14231) - Add more profiling traces (rust-lang/cargo#14238) - fix(overrides): Don't warn on duplicate packages from using '..' (rust-lang/cargo#14234) - fix(test): Redact elapsed time in the minutes time frame (rust-lang/cargo#14233) - test: Migrate lto tests to snapbox (rust-lang/cargo#14209) - fix: Ensure dep/feature activates the dependency on 2024 (rust-lang/cargo#14221) - chore(docs): update index of reference (rust-lang/cargo#14228) - test: migrate test to snapbox (rust-lang/cargo#14226) - chore: remove duplicate words (rust-lang/cargo#14229) - docs(contrib): Document things I look for in RFCs (rust-lang/cargo#14222) - docs(ref): Note MSRV for features in the docs (rust-lang/cargo#14224) - test(progress): Resolve flakiness (rust-lang/cargo#14223) - fix(test): Reduce over-prescription to the caller (rust-lang/cargo#14217) - refactor: move get_source_id out of registry (rust-lang/cargo#14218) - fix: rename to `rustdoc::broken_intra_doc_links` (rust-lang/cargo#14215) - test: migrate member_errors, multitarget and new to snapbox (rust-lang/cargo#14210) - test: migrate generate_lockfile and glob_targets to snapbox (rust-lang/cargo#14200) - test: Ensure --list test works with cargo-bloat (rust-lang/cargo#14213) - dont make new constant InternedString in hot path (rust-lang/cargo#14211) - Fix compatible_with_older_cargo test. (rust-lang/cargo#14212) - test: migrate metabuild, metadata and net_config to snapbox (rust-lang/cargo#14162)

This fixes a race condition in the `panic_abort_tests` test which can randomly fail. Prior to #14226 the test would check the lines individually (which was also kinda broken for the same reason, but wouldn't actually fail).

rustbot assigned ehuss Jul 10, 2024

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

rustbot assigned epage and unassigned ehuss Jul 10, 2024

eth3lbert force-pushed the snapbox-test branch from 99378a9 to d4d2f8c Compare July 10, 2024 01:09

epage reviewed Jul 10, 2024

View reviewed changes

eth3lbert force-pushed the snapbox-test branch from 6162cf5 to 46e3adc Compare July 10, 2024 01:51

eth3lbert commented Jul 10, 2024

View reviewed changes

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

test: migrate test to snapbox

b3b814e

eth3lbert force-pushed the snapbox-test branch from 46e3adc to b3b814e Compare July 10, 2024 02:09

eth3lbert commented Jul 10, 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 10, 2024

bors merged commit 4e19f31 into rust-lang:master Jul 10, 2024

bors mentioned this pull request Jul 10, 2024

Unify no-library-target error into no-target warn #14163

Closed

eth3lbert deleted the snapbox-test branch July 10, 2024 18:54

weihanglo mentioned this pull request Jul 17, 2024

Update cargo rust-lang/rust#127838

Merged

rustbot added this to the 1.81.0 milestone Jul 17, 2024

weihanglo mentioned this pull request Jul 24, 2024

Port from bespoke assertions of snapbox #14039

Closed

ehuss mentioned this pull request Feb 10, 2025

Fix race condition in panic_abort_tests #15169

Merged

Conversation

eth3lbert commented Jul 10, 2024

What does this PR try to resolve?

Uh oh!

rustbot commented Jul 10, 2024

Uh oh!

eth3lbert commented Jul 10, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eth3lbert commented Jul 10, 2024

Uh oh!

epage commented Jul 10, 2024

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

epage commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

bors commented Jul 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants