client: use "localhost:port" as authority if target is ":port" #4017
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
dfawley
reviewed
Nov 6, 2020
|
@dfawley Added the test in authority_test.go. |
dfawley
reviewed
Nov 11, 2020
dfawley
reviewed
Nov 12, 2020
test/authority_test.go
Outdated
| @@ -33,44 +34,48 @@ import ( | |||
| testpb "google.golang.org/grpc/test/grpc_testing" | |||
| ) | |||
|
|
|||
| func authorityChecker(expectedAuthority *string) func(context.Context, *testpb.Empty) (*testpb.Empty, error) { | |||
There was a problem hiding this comment.
I'm not sure about passing a pointer here without synchronization. It may fail the race test.
I'd do this instead:
func authorityChecker(ctx context.Context, expectedAuthority string) (*testpb.Empty, error) {
// Same body as closure
}
...
ss := &stubServer{
emptyCall: func(ctx context.Context, _ *testpb.Empty) (*testpb.Empty, error) {
// Simple case:
return authorityChecker(ctx, wantAuthority)
// Complex case:
wantAuthorityMu.Lock()
defer wantAuthorityMu.Unlock()
return authorityChecker(ctx, wantAuthority)
}
}Or use a channel to pass the expected authority to the handler, but that's probably more trouble than it's worth.
There was a problem hiding this comment.
Made this change.
test/authority_test.go
Outdated
| } | ||
| if err := ss.Start(nil); err != nil { | ||
| t.Fatalf("Error starting endpoint server: %v", err) | ||
| return |
There was a problem hiding this comment.
return-after-fatal is unncessary.
There was a problem hiding this comment.
Removed return
test/authority_test.go
Outdated
Comment on lines
167
to
171
| s := strings.Split(ss.address, ":") | ||
| if len(s) != 2 { | ||
| t.Fatalf("No port in address: %v", ss.address) | ||
| return | ||
| } |
There was a problem hiding this comment.
Using net package for this now.
dfawley
approved these changes
Nov 12, 2020
test/authority_test.go
Outdated
| expectedAuthority = "localhost:" + s[1] | ||
| authorityMu.Lock() | ||
| expectedAuthority = "localhost:" + port | ||
| authorityMu.Unlock() | ||
| // ss.Start dials, but not the ":[port]" target that is being tested here. | ||
| // Dial again, with ":[port]" as the target. | ||
| cc, err := grpc.Dial(":"+s[1], grpc.WithInsecure()) |
dfawley
changed the title
davidkhala
pushed a commit
to Hyperledger-TWGC/grpc
that referenced
this pull request
Dec 7, 2020
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.
Fixes #3983 .