Cherry-pick #9827 to 6.x: Remove trailing whitespace from golden files #9832
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
When system tests are run with the `GENERATE` environment variable set, we regenerate golden files used by these tests. To do this we use the Python `json.dump` function, which adds trailing whitespaces when it is called with the `indent` argument (which we do). From the Python docs at https://docs.python.org/2/library/json.html: > Note Since the default item separator is ', ', the output might include trailing whitespace when indent is specified. You can use separators=(',', ': ') to avoid this. Per the suggestion in the docs, this change adds the `separators` argument as well, to avoid generating trailing whitespace. This PR also regenerates all golden files with the new regeneration code. (cherry picked from commit bb92226)
|
I regenerated the golden files in this backport PR because 6.x uses different fields than master. While doing that it looks like some golden files never existed in 6.x (e.g. |
kaiyan-sheng
approved these changes
Dec 28, 2018
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.
Cherry-pick of PR #9827 to 6.x branch. Original message:
When system tests are run with the
GENERATEenvironment variable set, we regenerate golden files used by these tests. To do this we use the Pythonjson.dumpfunction, which adds trailing whitespaces when it is called with theindentargument (which we do). From the Python docs at https://docs.python.org/2/library/json.html:Per the suggestion in the docs, this change adds the
separatorsargument as well, to avoid generating trailing whitespace.This PR also regenerates all golden files with the new regeneration code.