Skip to content

Commit c0de489

Browse files
authored
priority: add a test helper to override the init timeout in tests (#8704)
This is an initial cleanup before the actual work required for #8516 The way the init timeout is currently overridden in existing tests is unnecessary complicated and hard to read. This simplifies things and ensures that the previous pattern is not followed when new tests are written. RELEASE NOTES: none
1 parent e816736 commit c0de489

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

internal/xds/balancer/priority/balancer_test.go

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ func init() {
7474
balancer.Register(&anotherRR{Builder: balancer.Get(roundrobin.Name)})
7575
}
7676

77+
func overrideInitTimeout(t *testing.T, val time.Duration) {
78+
orig := DefaultPriorityInitTimeout
79+
DefaultPriorityInitTimeout = val
80+
t.Cleanup(func() { DefaultPriorityInitTimeout = orig })
81+
}
82+
7783
// When a high priority is ready, adding/removing lower locality doesn't cause
7884
// changes.
7985
//
@@ -674,13 +680,7 @@ func (s) TestPriority_InitTimeout(t *testing.T) {
674680
defer cancel()
675681

676682
const testPriorityInitTimeout = 200 * time.Millisecond
677-
defer func() func() {
678-
old := DefaultPriorityInitTimeout
679-
DefaultPriorityInitTimeout = testPriorityInitTimeout
680-
return func() {
681-
DefaultPriorityInitTimeout = old
682-
}
683-
}()()
683+
overrideInitTimeout(t, testPriorityInitTimeout)
684684

685685
cc := testutils.NewBalancerClientConn(t)
686686
bb := balancer.Get(Name)
@@ -745,13 +745,7 @@ func (s) TestPriority_RemovesAllPriorities(t *testing.T) {
745745
defer cancel()
746746

747747
const testPriorityInitTimeout = 200 * time.Millisecond
748-
defer func() func() {
749-
old := DefaultPriorityInitTimeout
750-
DefaultPriorityInitTimeout = testPriorityInitTimeout
751-
return func() {
752-
DefaultPriorityInitTimeout = old
753-
}
754-
}()()
748+
overrideInitTimeout(t, testPriorityInitTimeout)
755749

756750
cc := testutils.NewBalancerClientConn(t)
757751
bb := balancer.Get(Name)
@@ -1011,10 +1005,7 @@ func (s) TestPriority_HighPriorityNoEndpoints(t *testing.T) {
10111005
// Test the case where the first and only priority is removed.
10121006
func (s) TestPriority_FirstPriorityUnavailable(t *testing.T) {
10131007
const testPriorityInitTimeout = 200 * time.Millisecond
1014-
defer func(t time.Duration) {
1015-
DefaultPriorityInitTimeout = t
1016-
}(DefaultPriorityInitTimeout)
1017-
DefaultPriorityInitTimeout = testPriorityInitTimeout
1008+
overrideInitTimeout(t, testPriorityInitTimeout)
10181009

10191010
cc := testutils.NewBalancerClientConn(t)
10201011
bb := balancer.Get(Name)

0 commit comments

Comments
 (0)