test: finish migration to .expect() APIs
#4376
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR completes the migration of the test suite to the new .expect() APIs and cleans up related helper code.
- Updated all test modules (
cli_self_upd,cli_rustup,cli_misc, andcli_exact) to use the.expect()/.expect_with_env()pattern with chained.await,.is_ok()/.is_err(), and.with_stdout()/.with_stderr(). - Enhanced the
Asserttype insrc/test/clitools.rswithredact()andremove_redactions()methods, removed deprecated assertion helpers, and made itsoutputfield public. - Removed the now-unneeded
similar_assertsdependency and deprecatedrun()-based helpers fromConfig, updatingCargo.tomlaccordingly.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/suite/cli_self_upd.rs | Switched to .expect() API and cleaned up redactions |
| tests/suite/cli_rustup.rs | Replaced run() with .expect*() calls and simplified redaction args |
| tests/suite/cli_misc.rs | Introduced assert_ok_with_paths helper and moved to .expect() API |
| tests/suite/cli_exact.rs | Converted pre-test run() calls to .expect(...).is_ok() |
| src/test/clitools.rs | Added redact/remove_redactions, exposed output, removed deprecated helpers |
| Cargo.toml | Dropped similar-asserts from the test feature |
rami3l
commented
Jun 7, 2025
| @@ -1393,10 +1393,27 @@ async fn override_by_toolchain_on_the_command_line() { | |||
|
|
|||
| "#]]) | |||
| .is_ok(); | |||
| cx.config | |||
There was a problem hiding this comment.
These assertions were accidentally deleted by me in the previous PR #4363, the original intent being merging Windows and Unix tests now that snapbox would automatically replace \ with /. However, I obviously deleted more than what was needed...
rami3l
force-pushed
the
test/fixup
branch
2 times, most recently
from
2ab9d63 to
bddde00
Compare
ChrisDenton
approved these changes
Jun 9, 2025
|
@ChrisDenton Many thanks to you and @djc for the review as well! 🙏 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #4359.
SemanticDiff