Make integration test more robust #2478
Merged
Conversation
This file contains hidden or 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
Contributor
| Uffizzi Preview |
| // Make sure that the resulting commit message doesn't contain the | ||
| // message of the fixup commit; compare this to | ||
| // squash_down_second_commit.go, where it does. | ||
| Content(Contains(" commit 01")). |
Owner
There was a problem hiding this comment.
Could we make this clearer by going Contains("commit 01").DoesNotContain("<fixup commit message>")?
Collaborator Author
There was a problem hiding this comment.
Not sure what you mean: use the literal string <fixup commit message>? That would mean don't use CreateNCommits, but create three commits manually. Sure, can do that.
Let me know if I misunderstood.
If you ran this test enough times it would eventually fail; this happened whenever the resulting squashed commit had a sha that happened to start with "02". We test that "commit 02" does not appear in the diff window, but in that case it did, at the very top of the window. A better fix might be to change the commit message that we use in CreateNCommits to something other than "commit XY", but that would require touching tons of tests, so this is the easier fix.
stefanhaller force-pushed the make-test-more-robust branch from 9099dfd to 161bb68 Compare 
Owner
| Nice work, merging |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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.
Fix an integration test that would occasionally fail. See commit message for details.