-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(test-sequencer): correctly figure out test runtime #14473
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,9 @@ const FAIL = 0; | |
const SUCCESS = 1; | ||
|
||
type Cache = { | ||
[key: string]: [0 | 1, number] | undefined; | ||
[key: string]: | ||
| [testStatus: typeof FAIL | typeof SUCCESS, testDuration: number] | ||
| undefined; | ||
}; | ||
|
||
export type ShardOptions = { | ||
|
@@ -42,7 +44,7 @@ type ShardPositionOptions = ShardOptions & { | |
* is called to store/update this information on the cache map. | ||
*/ | ||
export default class TestSequencer { | ||
private readonly _cache: Map<TestContext, Cache> = new Map(); | ||
private readonly _cache = new Map<TestContext, Cache>(); | ||
|
||
_getCachePath(testContext: TestContext): string { | ||
const {config} = testContext; | ||
|
@@ -191,7 +193,7 @@ export default class TestSequencer { | |
const failedB = this.hasFailed(testB); | ||
const hasTimeA = testA.duration != null; | ||
if (failedA !== failedB) { | ||
return failedA === true ? -1 : 1; | ||
return failedA ? -1 : 1; | ||
} else if (hasTimeA != (testB.duration != null)) { | ||
// If only one of two tests has timing information, run it last | ||
return hasTimeA ? 1 : -1; | ||
|
@@ -204,11 +206,7 @@ export default class TestSequencer { | |
} | ||
|
||
allFailedTests(tests: Array<Test>): Array<Test> | Promise<Array<Test>> { | ||
const hasFailed = (cache: Cache, test: Test) => | ||
cache[test.path]?.[0] === FAIL; | ||
return this.sort( | ||
tests.filter(test => hasFailed(this._getCache(test), test)), | ||
); | ||
return this.sort(tests.filter(test => this.hasFailed(test))); | ||
} | ||
|
||
cacheResults(tests: Array<Test>, results: AggregatedResult): void { | ||
|
@@ -219,9 +217,11 @@ export default class TestSequencer { | |
if (test != null && !testResult.skipped) { | ||
const cache = this._getCache(test); | ||
const perf = testResult.perfStats; | ||
const testRuntime = | ||
perf.runtime ?? test.duration ?? perf.end - perf.start; | ||
cache[testResult.testFilePath] = [ | ||
testResult.numFailingTests ? FAIL : SUCCESS, | ||
perf.runtime || 0, | ||
testResult.numFailingTests > 0 ? FAIL : SUCCESS, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not related to the rest of the changes, but I don't like |
||
testRuntime || 0, | ||
]; | ||
} | ||
}); | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix is falling back to
perf.end - perf.start
(as it was before #9366), but also checkingtest.duration
seems sensible to me.