feat(integ-runner): support config file #22937
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
|
|
aws-cdk-automation
previously requested changes
Nov 16, 2022
mrgrain
added
the
pr-linter/exempt-integ-test
aws-cdk-automation
dismissed
their stale review
✅ Updated pull request passes all PRLinter validations. Dissmissing previous PRLinter review.
mrgrain
commented
Nov 16, 2022
| @@ -75,6 +75,7 @@ export class WorkList<A> { | |||
|
|
|||
| public done() { | |||
| this.remaining.clear(); | |||
| this.stopTimer(); | |||
There was a problem hiding this comment.
This was a bug currently where the runner would not finish immediately if no tests are found.
(It was only completing after the 60s timeout)
mrgrain
commented
Nov 16, 2022
Comment on lines
-93
to
-169
|
|
||
| describe('from file', () => { | ||
| const configFile = 'integ.config.json'; | ||
| const writeConfig = (settings: IntegrationTestsDiscoveryOptions, fileName = configFile) => { | ||
| writeFileSync(fileName, JSON.stringify(settings, null, 2), { encoding: 'utf-8' }); | ||
| }; | ||
|
|
||
| test('find all', async () => { | ||
| writeConfig({}); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(3); | ||
| expect(integTests[0].fileName).toEqual(expect.stringMatching(/integ.integ-test1.js$/)); | ||
| expect(integTests[1].fileName).toEqual(expect.stringMatching(/integ.integ-test2.js$/)); | ||
| expect(integTests[2].fileName).toEqual(expect.stringMatching(/integ.integ-test3.js$/)); | ||
| }); | ||
|
|
||
|
|
||
| test('find named tests', async () => { | ||
| writeConfig({ tests: ['test-data/integ.integ-test1.js'] }); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(1); | ||
| expect(integTests[0].fileName).toEqual(expect.stringMatching(/integ.integ-test1.js$/)); | ||
| }); | ||
|
|
||
|
|
||
| test('test not found', async () => { | ||
| writeConfig({ tests: ['test-data/integ.integ-test16.js'] }); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(0); | ||
| expect(stderrMock.mock.calls[0][0]).toContain( | ||
| 'No such integ test: test-data/integ.integ-test16.js', | ||
| ); | ||
| expect(stderrMock.mock.calls[1][0]).toContain( | ||
| 'Available tests: test-data/integ.integ-test1.js test-data/integ.integ-test2.js test-data/integ.integ-test3.js', | ||
| ); | ||
| }); | ||
|
|
||
| test('exclude tests', async () => { | ||
| writeConfig({ tests: ['test-data/integ.integ-test1.js'], exclude: true }); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| const fileNames = integTests.map(test => test.fileName); | ||
| expect(integTests.length).toEqual(2); | ||
| expect(fileNames).not.toContain( | ||
| 'test/test-data/integ.integ-test1.js', | ||
| ); | ||
| }); | ||
|
|
||
| test('match regex', async () => { | ||
| writeConfig({ testRegex: ['1\.js$', '2\.js'] }); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(2); | ||
| expect(integTests[0].fileName).toEqual(expect.stringMatching(/integ.integ-test1.js$/)); | ||
| expect(integTests[1].fileName).toEqual(expect.stringMatching(/integ.integ-test2.js$/)); | ||
| }); | ||
|
|
||
| test('match regex with path', async () => { | ||
| writeConfig({ testRegex: ['other-data/integ\..*\.js$'] }); | ||
| const otherTestDir = new IntegrationTests('.'); | ||
| const integTests = await otherTestDir.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(1); | ||
| expect(integTests[0].fileName).toEqual(expect.stringMatching(/integ.other-test1.js$/)); | ||
| }); | ||
|
|
||
| test('can set app command', async () => { | ||
| writeConfig({ app: 'node --no-warnings {filePath}' }); | ||
| const integTests = await tests.fromFile(configFile); | ||
|
|
||
| expect(integTests.length).toEqual(3); | ||
| expect(integTests[0].appCommand).toEqual('node --no-warnings {filePath}'); | ||
| }); | ||
| }); |
There was a problem hiding this comment.
Removed because fromFile() is not a thing anymore.
mrgrain
commented
Nov 16, 2022
| @@ -1,21 +1,26 @@ | |||
| // Exercise all integ stacks and if they deploy, update the expected synth files | |||
| import { promises as fs } from 'fs'; | |||
There was a problem hiding this comment.
There was no point in having the test list file being async
Naumel
approved these changes
Nov 17, 2022
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
|
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
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.
Enables support for yarg's config file, replacing the current unused
IntegrationTests.fromFile()method.This also fixes a bug where
--listwould ignore test provided as args and via--from-fileand just list all tests.All Submissions:
Adding new Unconventional Dependencies:
New Features
yarn integto deploy the infrastructure and generate the snapshot (i.e.yarn integwithout--dry-run)?By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license