perf/refactor: partial test runner refactor #7109
Merged
Conversation
This file contains 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
DaniPopes
changed the title
onbjerg
approved these changes
Feb 13, 2024
DaniPopes
commented
Feb 13, 2024
| } | ||
|
|
||
| decoders.push(decoder); | ||
| } |
There was a problem hiding this comment.
Decoder is now obtained from the initial test results.
| let mut total_failed = 0; | ||
| let mut total_skipped = 0; | ||
| let mut suite_results: Vec<TestOutcome> = Vec::new(); | ||
| // Build the trace decoder. |
There was a problem hiding this comment.
Multiple decoders don't achieve anything more than a single one, so reuse a single decoder and clear the test-dependent data to reuse allocations.
crates/forge/bin/cmd/test/mod.rs
Outdated
| @@ -434,59 +383,60 @@ impl TestArgs { | |||
| TraceKind::Deployment => false, | |||
| }; | |||
|
|
|||
| // Traces need to be identified for gas reports too. | |||
| if should_include || self.gas_report { | |||
| } | ||
|
|
||
| if self.gas_report { | ||
| gas_report.analyze(&result.traces, &decoder).await; | ||
| } | ||
|
|
||
| // If the test failed, we want to stop processing the rest of the tests | ||
| if self.fail_fast && result.status == TestStatus::Failure { | ||
| break 'outer |
There was a problem hiding this comment.
This previously exited the loop without printing the summary. We also need to do this now since we push the results into the outcome at the end to avoid unnecessary cloning.
| let block_outcome = TestOutcome::new( | ||
| [(contract_name.clone(), suite_result)].into(), | ||
| self.allow_failure, | ||
| ); |
|
|
||
| total_passed += block_outcome.successes().count(); | ||
| total_failed += block_outcome.failures().count(); | ||
| total_skipped += block_outcome.skips().count(); |
There was a problem hiding this comment.
Moved to lazily calculating later. It's cheap anyway.
| @@ -550,157 +498,6 @@ impl Provider for TestArgs { | |||
| } | |||
| } | |||
|
|
|||
| /// The result of a single test | |||
| #[derive(Clone, Debug)] | |||
| pub struct Test { | |||
DaniPopes
force-pushed
the
dani/test-runner-refactor
branch
3 times, most recently
from
32b0aa8 to
962eb31
Compare
DaniPopes
force-pushed
the
dani/test-runner-refactor
branch
from
962eb31 to
7e18213
Compare
mattsse
approved these changes
Feb 14, 2024
Comment on lines
+186
to
+190
| pub calls: Vec<u64>, | ||
| pub min: u64, | ||
| pub mean: u64, | ||
| pub median: u64, | ||
| pub max: u64, |
| } | ||
|
|
||
| /// Flattens the test outcome into a list of individual tests. | ||
| // TODO: Replace this with `tests` and make it return `TestRef<'_>` |
2 tasks
This was referenced Apr 26, 2024
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.
Numerous perf improvements and simplifications in test runner code.
Option::as_sliceVec<TestOutcome>does not make sense, as only oneTestOutcomeis returned from the main testing function and it's the aggregate of all test suites. This fixes some displaying bugsTesttoSuiteTestResult, kinda ran out of names, but it's better than just "test". This is constructed by flattening both maps inTestOutcome, and wraps aTestResult.Review with "hide whitespace"