grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolver/delegatingresolver: wait for proxy resolver to be built in test (#8302)

This commit is contained in:
eshitachandwani 2025-05-08 14:55:43 +05:30 committed by GitHub
parent 0e656b20dd
commit d00f4acc38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/resolver/delegatingresolver/delegatingresolver_ext_test.go
View File

@ -588,6 +588,10 @@ func (s) TestDelegatingResolverUpdateStateDuringClose(t *testing.T) {
// Set up a manual DNS resolver to control the proxy address resolution.
proxyResolver := setupDNS(t)
proxyResolverBuilt := make(chan struct{})
proxyResolver.BuildCallback = func(resolver.Target, resolver.ClientConn, resolver.BuildOptions) {
close(proxyResolverBuilt)
}
unblockProxyResolverClose := make(chan struct{}, 1)
proxyResolver.CloseCallback = func() {
<-unblockProxyResolverClose
@ -607,11 +611,17 @@ func (s) TestDelegatingResolverUpdateStateDuringClose(t *testing.T) {
Endpoints: []resolver.Endpoint{{Addresses: []resolver.Address{{Addr: "1.1.1.1"}}}},
})
// Wait for the proxy resolver to be built before calling Close.
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
select {
case <-proxyResolverBuilt:
case <-ctx.Done():
t.Fatalf("Context timed out waiting for proxy resolver to be built.")
}
// Closing the delegating resolver will block until the test writes to the
// unblockProxyResolverClose channel.
go dr.Close()
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
select {
case <-targetResolverCloseCalled:
case <-ctx.Done():