cleanup: replace dial with newclient #8196
Conversation
|
Is this PR ready for review? |
yes, please |
janardhanvissa
force-pushed
the
replacing-dial-to-newclient
branch
from
6458128 to
d672f29
Compare
This reverts commit 79f6f35.
| t.Fatalf("Failed to create new client: %v", err) | ||
| t.Fatalf("grpc.NewClient(%q) = %v", lis.Addr().String(), err) |
There was a problem hiding this comment.
These log messages are suggested by Easwar's in other PR. Please see the discussion using the below links.
There was a problem hiding this comment.
Please revert this file as all the changes are only in error messages.
| @@ -166,7 +165,7 @@ func (s) TestEndpointShardingBasic(t *testing.T) { | |||
| } | |||
| cc, err := grpc.NewClient(mr.Scheme()+":///", dOpts...) | |||
| if err != nil { | |||
| log.Fatalf("Failed to create new client: %v", err) | |||
There was a problem hiding this comment.
Please only change log to t, the error message is fine.
There was a problem hiding this comment.
Please revert changes in this file as they are only error message changes.
There was a problem hiding this comment.
Please revert changes in this file as they are only error message changes.
| @@ -308,7 +308,7 @@ func (s) TestCZTopChannelRegistrationAndDeletionWhenDialFail(t *testing.T) { | |||
| // Make dial fails (due to no transport security specified) | |||
| _, err := grpc.NewClient("fake.addr") | |||
| if err == nil { | |||
| t.Fatal("expecting dial to fail") | |||
| t.Fatalf("grpc.NewClient() failed: %v", err) | |||
There was a problem hiding this comment.
The message being replaced was the opposite, please fix.
| @@ -274,7 +274,6 @@ func (te *test) clientConn() *grpc.ClientConn { | |||
| } | |||
| opts := []grpc.DialOption{ | |||
| grpc.WithTransportCredentials(insecure.NewCredentials()), | |||
| grpc.WithBlock(), | |||
There was a problem hiding this comment.
If you are removing WithBlock, you need to ensure the clientconn is ready before the function returns it. I ssupect this is the reason for the race conditions that you're seeing. Please use cc.Connect and testutils.AwaitState here to restore the behviour.
| func checkPickerUpdated(t *testing.T, d *gotData, e *expectedData) { | ||
| var ( | ||
| ok bool | ||
| st *stats.PickerUpdated | ||
| ) | ||
| if st, ok = d.s.(*stats.PickerUpdated); !ok { | ||
| t.Fatalf("got %T, want PickerUpdated", d.s) | ||
| } | ||
| if d.ctx == nil { | ||
| t.Fatalf("d.ctx = nil, want <non-nil>") | ||
| } | ||
| st.IsClient() // TODO remove this. | ||
| } |
There was a problem hiding this comment.
Please revert any assertion changes, we don't want to change the test logic.
addresses: #7049
RELEASE NOTES: None