github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Use a constructor properly in change tracker unit tests

Browse Source 
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.)
This commit is contained in:
Dan Winship 2024-04-29 16:41:33 -04:00
parent 21525f39e0
commit 2c348bf186
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/proxy/endpointschangetracker_test.go
View File

@ -1037,7 +1037,6 @@ func TestUpdateEndpointsMap(t *testing.T) {
for tci, tc := range testCases { for tci, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
fp := newFakeProxier(v1.IPv4Protocol, time.Time{}) fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
fp.hostname = testHostname
// First check that after adding all previous versions of endpoints, // First check that after adding all previous versions of endpoints,
// the fp.previousEndpointsMap is as we expect. // the fp.previousEndpointsMap is as we expect.

2
pkg/proxy/endpointslicecache_test.go
View File

@ -610,7 +610,6 @@ func TestEndpointSliceCacheClearedCorrectly(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
fp := newFakeProxier(v1.IPv4Protocol, time.Time{}) fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
fp.hostname = testHostname
for _, epSlice := range tc.currEndpointSlices { for _, epSlice := range tc.currEndpointSlices {
fp.addEndpointSlice(epSlice) fp.addEndpointSlice(epSlice)
@ -648,7 +647,6 @@ func TestSameServiceEndpointSliceCacheClearedCorrectly(t *testing.T) {
} }
fp := newFakeProxier(v1.IPv4Protocol, time.Time{}) fp := newFakeProxier(v1.IPv4Protocol, time.Time{})
fp.hostname = testHostname
for _, epSlice := range currEndpointSlices { for _, epSlice := range currEndpointSlices {
fp.addEndpointSlice(epSlice) fp.addEndpointSlice(epSlice)

10
pkg/proxy/servicechangetracker_test.go
View File

@ -621,20 +621,16 @@ type FakeProxier struct {
serviceChanges *ServiceChangeTracker serviceChanges *ServiceChangeTracker
svcPortMap ServicePortMap svcPortMap ServicePortMap
endpointsMap EndpointsMap endpointsMap EndpointsMap
hostname string
} }
func newFakeProxier(ipFamily v1.IPFamily, t time.Time) *FakeProxier { func newFakeProxier(ipFamily v1.IPFamily, t time.Time) *FakeProxier {
ect := NewEndpointsChangeTracker(testHostname, nil, ipFamily, nil, nil)
ect.trackerStartTime = t
return &FakeProxier{ return &FakeProxier{
svcPortMap: make(ServicePortMap), svcPortMap: make(ServicePortMap),
serviceChanges: NewServiceChangeTracker(nil, ipFamily, nil, nil), serviceChanges: NewServiceChangeTracker(nil, ipFamily, nil, nil),
endpointsMap: make(EndpointsMap), endpointsMap: make(EndpointsMap),
endpointsChanges: &EndpointsChangeTracker{ endpointsChanges: ect,
lastChangeTriggerTimes: make(map[types.NamespacedName][]time.Time),
trackerStartTime: t,
processEndpointsMapChange: nil,
endpointSliceCache: NewEndpointSliceCache(testHostname, ipFamily, nil, nil),
},
} }
} }