pemfile: Make test happy with Go1.16 #4164
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
Go1.16 adds a new unexported field to x509.CertPool which causes our tests to fail because cmp.Equal() isn't happy. This change introduces a helper function which compares certprovider.KeyMaterial in a way that makes the test happy with the new Go version.
menghanl
approved these changes
Jan 20, 2021
dfawley
approved these changes
Jan 20, 2021
| @@ -55,6 +56,29 @@ func Test(t *testing.T) { | |||
| grpctest.RunSubTests(t, s{}) | |||
| } | |||
|
|
|||
| func compareKeyMaterial(got, want *certprovider.KeyMaterial) error { | |||
| // TODO(easwars): Remove all references to reflect.DeepEqual and use | |||
| // cmp.Equal instead. Currently, the later panics because x509.Certificate | |||
There was a problem hiding this comment.
Changed the comment since I have switched to cmp.Equal() with a nil check.
Comment on lines
62
to
63
| // type defines an Equal method, but does not check for nil. This has been | ||
| // fixed in |
There was a problem hiding this comment.
Can't we do a manual check for nil in the meantime, then?
dfawley
approved these changes
Jan 21, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Go1.16 adds a new unexported field to x509.CertPool which causes our
tests to fail because cmp.Equal() isn't happy. This change introduces a
helper function which compares certprovider.KeyMaterial in a way that
makes the test happy with the new Go version.
Fixes #4162