cleanup: replace dial with newclient #8602
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,74 +62,63 @@ func init() { resolver.Register(testResolverForParser{}) } | |
| func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) { | ||
| tests := []struct { | ||
| target string | ||
| wantNewClientParse resolver.Target | ||
| wantCustomParse resolver.Target | ||
| }{ | ||
| // No scheme is specified. | ||
| { | ||
| target: "://a/b", | ||
| wantNewClientParse: generateTarget("dns:///://a/b"), | ||
| wantCustomParse: generateTarget("testresolverforparser:///://a/b"), | ||
| }, | ||
| { | ||
| target: "a//b", | ||
| wantNewClientParse: generateTarget("dns:///a//b"), | ||
| wantCustomParse: generateTarget("testresolverforparser:///a//b"), | ||
| }, | ||
|
|
||
| // An unregistered scheme is specified. | ||
| { | ||
| target: "a:///", | ||
| wantNewClientParse: generateTarget("dns:///a:///"), | ||
| wantCustomParse: generateTarget("testresolverforparser:///a:///"), | ||
| }, | ||
| { | ||
| target: "a:b", | ||
| wantNewClientParse: generateTarget("dns:///a:b"), | ||
| wantCustomParse: generateTarget("testresolverforparser:///a:b"), | ||
| }, | ||
|
|
||
| // A registered scheme is specified. | ||
| { | ||
| target: "dns://a.server.com/google.com", | ||
| wantNewClientParse: generateTarget("dns://a.server.com/google.com"), | ||
| wantCustomParse: generateTarget("dns://a.server.com/google.com"), | ||
| }, | ||
| { | ||
| target: "unix-abstract:/ a///://::!@#$%25^&*()b", | ||
| wantNewClientParse: generateTarget("unix-abstract:/ a///://::!@#$%25^&*()b"), | ||
| wantCustomParse: generateTarget("unix-abstract:/ a///://::!@#$%25^&*()b"), | ||
| }, | ||
| { | ||
| target: "unix-abstract:passthrough:abc", | ||
| wantNewClientParse: generateTarget("unix-abstract:passthrough:abc"), | ||
| wantCustomParse: generateTarget("unix-abstract:passthrough:abc"), | ||
| }, | ||
| { | ||
| target: "passthrough:///unix:///a/b/c", | ||
| wantNewClientParse: generateTarget("passthrough:///unix:///a/b/c"), | ||
| wantCustomParse: generateTarget("passthrough:///unix:///a/b/c"), | ||
| }, | ||
|
|
||
| // Cases for `scheme:absolute-path`. | ||
| { | ||
| target: "dns:/a/b/c", | ||
| wantNewClientParse: generateTarget("dns:/a/b/c"), | ||
| wantCustomParse: generateTarget("dns:/a/b/c"), | ||
| }, | ||
| { | ||
| target: "unregistered:/a/b/c", | ||
| wantNewClientParse: generateTarget("dns:///unregistered:/a/b/c"), | ||
| wantCustomParse: generateTarget("testresolverforparser:///unregistered:/a/b/c"), | ||
| }, | ||
|
|
@@ -138,19 +127,9 @@ func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) { | |
| for _, test := range tests { | ||
| t.Run(test.target, func(t *testing.T) { | ||
| resetInitialResolverState() | ||
| cc, err := NewClient(test.target, WithTransportCredentials(insecure.NewCredentials())) | ||
| if err != nil { | ||
| t.Fatalf("grpc.NewClient(%q) failed: %v", test.target, err) | ||
| } | ||
| cc.Close() | ||
|
|
||
|
|
@@ -159,19 +138,9 @@ func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) { | |
| } | ||
|
|
||
| resolver.SetDefaultScheme("testresolverforparser") | ||
| cc, err = NewClient(test.target, WithTransportCredentials(insecure.NewCredentials())) | ||
| if err != nil { | ||
| t.Fatalf("grpc.NewClient(%q) failed: %v", test.target, err) | ||
| } | ||
| cc.Close() | ||
|
|
||
|
|
@@ -186,18 +155,14 @@ func (s) TestParsedTarget_Success_WithoutCustomDialer(t *testing.T) { | |
|
|
||
| func (s) TestParsedTarget_Failure_WithoutCustomDialer(t *testing.T) { | ||
| targets := []string{ | ||
|
Comment on lines
189
to
193
There was a problem hiding this comment. We should not remove these test cases. Since
There was a problem hiding this comment. I am using Idle because these malformed targets result in zero resolved addresses. The client never attempts a connection, so it stays IDLE and cannot reach TRANSIENT_FAILURE There was a problem hiding this comment. There's an INFO log similar to the following from the unix resolver:
Since this is the only indication that the connection attempt failed (no errors are returned), I think this should be logged as an ERROR. Presently, the method responsible for channelz trace event logging is logging everything at as an INFO log. We could have at accept the severity as an additional param to achieve this. Once this is an error log, we can assert that the error is logged similar to the following. grpc-go/internal/transport/keepalive_test.go Line 401 in 8389ddb @dfawley do you think we should log the failure to exit idle mode in There was a problem hiding this comment. Two options:
Either way, RPCs will fail with that error message text, and we shouldn't need anything besides INFO (or even V2?) logs. There was a problem hiding this comment. I've raised a PR with the proposed change: #8643. @vinothkumarr227 you can leave this test unchanged in this PR, I'll update the test at part of #8643. There was a problem hiding this comment. After investigating, I confirmed that RPCs already fail with the correct error message. The connection is attempted when the stream creation function calls exitIdle, as seen here: Lines 180 to 186 in 2d92271 Therefore, no changes are needed to propagate the error. While cc.Connect itself cannot return an error due to its signature, any resolver build failure is correctly surfaced to the user during the next RPC. This test can be changes as follows to create a new stream and validate the error. cc, err := NewClient(target, WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
t.Fatalf("NewClient(%q) failed: %v", target, err)
}
defer cc.Close()
wantErrSubstr := "failed to exit idle mode"
if _, err := cc.NewStream(ctx, &StreamDesc{}, "/my.service.v1.MyService/UnaryCall"); err == nil {
t.Fatalf("NewStream() succeeded with target = %q, cc.parsedTarget = %+v, expected to fail", target, cc.parsedTarget)
} else if !strings.Contains(err.Error(), wantErrSubstr) {
t.Fatalf("NewStream() with target = %q returned unexpected error: got %v, want substring %q", target, err, wantErrSubstr)
}There was a problem hiding this comment. Thanks for the suggestion. I have modified the code changes accordingly There was a problem hiding this comment. In the team meeting, we discussed this and decided that we should keep the origin test that uses |
||
| "unix:/%a/b/c", | ||
| } | ||
|
|
||
| for _, target := range targets { | ||
| t.Run(target, func(t *testing.T) { | ||
| if cc, err := NewClient(target, WithTransportCredentials(insecure.NewCredentials())); err == nil { | ||
| defer cc.Close() | ||
| t.Fatalf("grpc.NewClient(%q) succeeded cc.parsedTarget = %+v, expected to fail", target, cc.parsedTarget) | ||
| } | ||
| }) | ||
| } | ||
|
|
@@ -234,7 +199,7 @@ func (s) TestParsedTarget_WithCustomDialer(t *testing.T) { | |
| wantDialerAddress: "127.0.0.1:50051", | ||
| }, | ||
| { | ||
| target: "passthrough:///:///127.0.0.1:50051", | ||
| wantParsed: resolver.Target{URL: *testutils.MustParseURL(fmt.Sprintf("%s:///%s", defScheme, ":///127.0.0.1:50051"))}, | ||
| wantDialerAddress: ":///127.0.0.1:50051", | ||
| }, | ||
|
|
@@ -244,17 +209,17 @@ func (s) TestParsedTarget_WithCustomDialer(t *testing.T) { | |
| wantDialerAddress: "127.0.0.1:50051", | ||
| }, | ||
| { | ||
| target: "passthrough:///://authority/127.0.0.1:50051", | ||
| wantParsed: resolver.Target{URL: *testutils.MustParseURL(fmt.Sprintf("%s:///%s", defScheme, "://authority/127.0.0.1:50051"))}, | ||
| wantDialerAddress: "://authority/127.0.0.1:50051", | ||
| }, | ||
| { | ||
| target: "passthrough:////unix/socket/address", | ||
| wantParsed: resolver.Target{URL: *testutils.MustParseURL(fmt.Sprintf("%s:///%s", defScheme, "/unix/socket/address"))}, | ||
| wantDialerAddress: "/unix/socket/address", | ||
| }, | ||
| { | ||
| target: "passthrough:///", | ||
arjan-bal marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| wantParsed: resolver.Target{URL: *testutils.MustParseURL(fmt.Sprintf("%s:///%s", defScheme, ""))}, | ||
| wantDialerAddress: "", | ||
| }, | ||
|
|
@@ -273,11 +238,12 @@ func (s) TestParsedTarget_WithCustomDialer(t *testing.T) { | |
| return nil, errors.New("dialer error") | ||
| } | ||
|
|
||
| cc, err := NewClient(test.target, WithTransportCredentials(insecure.NewCredentials()), WithContextDialer(dialer)) | ||
| if err != nil { | ||
| t.Fatalf("grpc.NewClient(%q) failed: %v", test.target, err) | ||
| } | ||
| defer cc.Close() | ||
| cc.Connect() | ||
|
|
||
| select { | ||
| case addr := <-addrCh: | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.