xdsclient: improve authority watchers test

grpc · Oct 7, 2022 · cc51ec3 · cc51ec3
1 parent c03925d
commit cc51ec3
Show file tree

Hide file tree

Showing 6 changed files with 329 additions and 363 deletions.
diff --git a/xds/internal/xdsclient/authority_test.go b/xds/internal/xdsclient/authority_test.go
diff --git a/xds/internal/xdsclient/client_new.go b/xds/internal/xdsclient/client_new.go
@@ -75,8 +75,12 @@ func newWithConfig(config *bootstrap.Config, watchExpiryTimeout time.Duration, i
 // Testing Only
 //
 // This function should ONLY be used for testing purposes.
-func NewWithConfigForTesting(config *bootstrap.Config, watchExpiryTimeout time.Duration) (XDSClient, error) {
-	cl, err := newWithConfig(config, watchExpiryTimeout, defaultIdleAuthorityDeleteTimeout)
+func NewWithConfigForTesting(config *bootstrap.Config, watchExpiryTimeout, authorityIdleTimeout time.Duration) (XDSClient, error) {
+	idleTimeout := defaultIdleAuthorityDeleteTimeout
+	if authorityIdleTimeout != time.Duration(0) {
+		idleTimeout = authorityIdleTimeout
+	}
+	cl, err := newWithConfig(config, watchExpiryTimeout, idleTimeout)
 	if err != nil {
 		return nil, err
 	}