Skip to content

chore(integ-tests): cleanup the old *.expected.json files in favor of the new integ-tests#20210

Merged
mergify[bot] merged 3 commits intoaws:masterfrom
robertd:robertd/integ-test-cleanup
May 5, 2022
Merged

chore(integ-tests): cleanup the old *.expected.json files in favor of the new integ-tests#20210
mergify[bot] merged 3 commits intoaws:masterfrom
robertd:robertd/integ-test-cleanup

Conversation

@robertd
Copy link
Copy Markdown
Contributor

@robertd robertd commented May 4, 2022

Remove the old *.expected.json files in favor of the newly rolled out integ-tests.

All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@robertd robertd marked this pull request as draft May 4, 2022 15:42
@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented May 4, 2022

@github-actions github-actions bot added the p2 label May 4, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team May 4, 2022 15:42
@robertd
Copy link
Copy Markdown
Contributor Author

robertd commented May 4, 2022

@corymhall I've marked this as PR as WIP until I push the updates to CONTRIBUTING.md.

@robertd
Copy link
Copy Markdown
Contributor Author

robertd commented May 4, 2022 •
edited
Loading

@corymhall Can you please advise on cloudformation-include package use of old *.expected.jsonformat.

Specifically these files being used in cloudformation-include/test/nested-stacks.test.ts:
packages/@aws-cdk/cloudformation-include/test/test-templates/nested/child-import-stack.expected.json
packages/@aws-cdk/cloudformation-include/test/test-templates/nested/only-nested-stack.expected.json

Should these be simply renamed to omit *.expected.*, as they've been pretty static in the past? Or should they be pointing to the corresponding dynamically created .json files in the newly created nested-stacks.integ.snapshots directory?

@robertd robertd force-pushed the robertd/integ-test-cleanup branch from 99ba33f to 8c5178b Compare May 5, 2022 05:24
@robertd robertd force-pushed the robertd/integ-test-cleanup branch from 8c5178b to b1aaa70 Compare May 5, 2022 05:56
@corymhall
Copy link
Copy Markdown
Contributor

corymhall commented May 5, 2022

Specifically these files being used in cloudformation-include/test/nested-stacks.test.ts:
packages/@aws-cdk/cloudformation-include/test/test-templates/nested/child-import-stack.expected.json
packages/@aws-cdk/cloudformation-include/test/test-templates/nested/only-nested-stack.expected.json

Should these be simply renamed to omit .expected., as they've been pretty static in the past? Or should they be pointing to the corresponding dynamically created .json files in the newly created nested-stacks.integ.snapshots directory?

It looks like those specific files are just used for unit tests so you can just leave those as is.

@robertd robertd marked this pull request as ready for review May 5, 2022 16:15
@robertd
Copy link
Copy Markdown
Contributor Author

robertd commented May 5, 2022

@corymhall Ready for your review. Thanks.

corymhall
corymhall approved these changes May 5, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@corymhall corymhall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robertd thanks for doing this!

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented May 5, 2022

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit f500e16 into aws:master May 5, 2022
@aws-cdk-automation
Copy link
Copy Markdown
Collaborator

aws-cdk-automation commented May 5, 2022

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: dde576f
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@robertd robertd deleted the robertd/integ-test-cleanup branch May 5, 2022 17:00
@robertd robertd mentioned this pull request May 11, 2022
Merged
wphilipw pushed a commit to wphilipw/aws-cdk that referenced this pull request May 23, 2022
@robertd @wphilipw
chore(integ-tests): cleanup the old *.expected.json files in favor of…
ff775c6 
… the new integ-tests (aws#20210)

Remove the old `*.expected.json` files in favor of the newly rolled out integ-tests.

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@corymhall corymhall corymhall approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Naumel Naumel

Labels

p2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@robertd @corymhall @aws-cdk-automation @Naumel