Skip to content

Commit

Permalink
[SYNTH-17150] Update selective rerun spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
Drarig29 committed Nov 14, 2024
1 parent 0cec4db commit 3dcb432
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ exports[`Default reporter runEnd Case with 2 passed results, of which 1 comes fr
Continuous Testing Summary:
• Test Results: 2 passed (1 in a previous CI batch), 0 failed
• Selective re-run: ran 1 out of 2 tests
• Selective rerun: ran 1 out of 2 tests
• Total Duration: 9m 28s
"
`;
Expand All @@ -182,7 +182,7 @@ View full summary in Datadog: https://app.datadoghq.com/synthetics/expl
Continuous Testing Summary:
• Test Results: 2 passed (1 in a previous CI batch), 1 failed, 3 failed (non-blocking), 1 skipped (1 timed out, 2 critical errors)
• Selective re-run: ran 5 out of 6 tests
• Selective rerun: ran 5 out of 6 tests
• Total Duration: 9m 28s
"
`;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/synthetics/__tests__/reporters/junit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ describe('Junit reporter', () => {
...getDefaultSuiteStats(),
errors: 0,
failures: 1,
skipped: 1, // not 2 because skipped by selective re-run counts as passed
skipped: 1, // not 2 because skipped by selective rerun counts as passed
tests: 3,
})
})
Expand Down
6 changes: 3 additions & 3 deletions src/commands/synthetics/__tests__/run-tests-lib.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ describe('run-test', () => {
expect(stopTunnelSpy).toHaveBeenCalledTimes(1)
})

test('log when selective re-run is rate-limited', async () => {
test('log when selective rerun is rate-limited', async () => {
jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(
Promise.resolve({
initialSummary: utils.createInitialSummary(),
Expand Down Expand Up @@ -581,11 +581,11 @@ describe('run-test', () => {
})

expect(mockReporter.error).toHaveBeenCalledWith(
'The selective re-run feature was rate-limited. All tests will be re-run.\n\n'
'The selective rerun feature was rate-limited. All tests will be re-run.\n\n'
)
})

test('selective re-run defaults to undefined', async () => {
test('selective rerun defaults to undefined', async () => {
jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(
Promise.resolve({
initialSummary: utils.createInitialSummary(),
Expand Down
4 changes: 2 additions & 2 deletions src/commands/synthetics/__tests__/utils/public.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ describe('utils', () => {
status: 'in_progress',
results: [
// First test
{...getSkippedResultInBatch()}, // skipped by selective re-run
{...getSkippedResultInBatch()}, // skipped by selective rerun
// Second test
{...getInProgressResultInBatch(), test_public_id: 'other-public-id', result_id: 'rid-2'},
],
Expand Down Expand Up @@ -1155,7 +1155,7 @@ describe('utils', () => {
expect(mockReporter.resultReceived).toHaveBeenNthCalledWith(1, {
...getSkippedResultInBatch(),
})
// And marked as passed because it's selective re-run
// And marked as passed because it's selective rerun
const skippedResult: Result = {
executionRule: ExecutionRule.SKIPPED,
passed: true,
Expand Down
4 changes: 2 additions & 2 deletions src/commands/synthetics/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ type ServerResultInBatch = BaseResultInBatch | SkippedResultInBatch

export interface ServerBatch {
// The batch from the server contains skipped results, which we're going to remove since we don't
// care about skipped results internally (except when they are skipped by a selective re-run).
// care about skipped results internally (except when they are skipped by a selective rerun).
results: ServerResultInBatch[]
status: BatchStatus
}
Expand Down Expand Up @@ -453,7 +453,7 @@ export interface Summary {
// The batchId is associated to a full run of datadog-ci: multiple suites will be in the same batch.
batchId: string
criticalErrors: number
// Number of results expected by datadog-ci, prior to any selective re-run.
// Number of results expected by datadog-ci, prior to any selective rerun.
expected: number
failed: number
failedNonBlocking: number
Expand Down
2 changes: 1 addition & 1 deletion src/commands/synthetics/reporters/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ export class DefaultReporter implements MainReporter {

if (summary.previouslyPassed) {
lines.push(
`• Selective re-run: ran ${summary.expected - summary.previouslyPassed} out of ${summary.expected} tests`
`• Selective rerun: ran ${summary.expected - summary.previouslyPassed} out of ${summary.expected} tests`
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/commands/synthetics/run-tests-lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const executeTests = async (
}

if (trigger.selective_rerun_rate_limited) {
reporter.error('The selective re-run feature was rate-limited. All tests will be re-run.\n\n')
reporter.error('The selective rerun feature was rate-limited. All tests will be re-run.\n\n')
}

try {
Expand Down

0 comments on commit 3dcb432

Please sign in to comment.