Skip to content

Commit 2c348bf

Browse files
committed
Use a constructor properly in change tracker unit tests
newFakeProxier was inlining the details of NewEndpointsChangeTracker so it could override trackerStartTime, but it would be better and more future-proof to just call NewEndpointsChangeTracker normally and then edit that one field. (Also remove an unused FakeProxier field.)
1 parent 21525f3 commit 2c348bf

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

pkg/proxy/endpointschangetracker_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,6 @@ func TestUpdateEndpointsMap(t *testing.T) {
10371037
for tci, tc := range testCases {
10381038
t.Run(tc.name, func(t *testing.T) {
10391039
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
1040-
fp.hostname = testHostname
10411040

10421041
// First check that after adding all previous versions of endpoints,
10431042
// the fp.previousEndpointsMap is as we expect.

pkg/proxy/endpointslicecache_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ func TestEndpointSliceCacheClearedCorrectly(t *testing.T) {
610610
for _, tc := range testCases {
611611
t.Run(tc.name, func(t *testing.T) {
612612
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
613-
fp.hostname = testHostname
614613

615614
for _, epSlice := range tc.currEndpointSlices {
616615
fp.addEndpointSlice(epSlice)
@@ -648,7 +647,6 @@ func TestSameServiceEndpointSliceCacheClearedCorrectly(t *testing.T) {
648647
}
649648

650649
fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
651-
fp.hostname = testHostname
652650

653651
for _, epSlice := range currEndpointSlices {
654652
fp.addEndpointSlice(epSlice)

pkg/proxy/servicechangetracker_test.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -621,20 +621,16 @@ type FakeProxier struct {
621621
serviceChanges *ServiceChangeTracker
622622
svcPortMap ServicePortMap
623623
endpointsMap EndpointsMap
624-
hostname string
625624
}
626625

627626
func newFakeProxier(ipFamily v1.IPFamily, t time.Time) *FakeProxier {
627+
ect := NewEndpointsChangeTracker(testHostname, nil, ipFamily, nil, nil)
628+
ect.trackerStartTime = t
628629
return &FakeProxier{
629-
svcPortMap: make(ServicePortMap),
630-
serviceChanges: NewServiceChangeTracker(nil, ipFamily, nil, nil),
631-
endpointsMap: make(EndpointsMap),
632-
endpointsChanges: &EndpointsChangeTracker{
633-
lastChangeTriggerTimes: make(map[types.NamespacedName][]time.Time),
634-
trackerStartTime: t,
635-
processEndpointsMapChange: nil,
636-
endpointSliceCache: NewEndpointSliceCache(testHostname, ipFamily, nil, nil),
637-
},
630+
svcPortMap: make(ServicePortMap),
631+
serviceChanges: NewServiceChangeTracker(nil, ipFamily, nil, nil),
632+
endpointsMap: make(EndpointsMap),
633+
endpointsChanges: ect,
638634
}
639635
}
640636

0 commit comments

Comments
 (0)