PodTemplateUtils#combine shouldn't have a side-effect on the parent pod template
#853
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
Vlatombe
changed the title
PodTemplateUtils#combine shouldn't have a side-effect on the parent pod template
jglick
approved these changes
Oct 2, 2020
| assertThat(result.getNodeProperties(), hasItems(nodeProperties1.get(0),nodeProperties2.get(0))); | ||
| assertThat(podTemplate1.getNodeProperties(), contains(toolHome1)); | ||
| assertThat(podTemplate2.getNodeProperties(), contains(toolHome2)); | ||
| assertThat(result.getNodeProperties(), contains(toolHome1, toolHome2)); |
There was a problem hiding this comment.
Is this test reproducing the bug? I thought that the problem was that the parent template would grow endlessly, so we should have a test asserting that after combination the parent template does not contain some property.
There was a problem hiding this comment.
Or that the size of the parent template's nodeProperties didn't change.
There was a problem hiding this comment.
First assertion failed with the previous code, since there was a side-effect on the first pod template. Note that contains does an exact match of all specified elements, unlike hasItems.
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.
Problem introduced in #318: https://github.com/jenkinsci/kubernetes-plugin/pull/318/files#diff-eff844000c9e60765310e70fa8c8a71cL308-L310