github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-20 01:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Clean up leaked goroutines in cache unit tests

Browse Source 
Kubernetes-commit: 6747bf7a9cb3009aae4cba1e1d249d56a66a981b
This commit is contained in:
Jordan Liggitt 2025-04-01 13:59:32 -04:00 committed by Kubernetes Publisher
parent d01bdb17a5
commit a3cad0dc91
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/cache/delta_fifo_test.go vendored
View File

@ -89,6 +89,15 @@ func testPop(f *DeltaFIFO) testFifoObject {
return Pop(f).(Deltas).Newest().Object.(testFifoObject)
}
// testPopIfAvailable returns `{}, false` if Pop returns a nil object
func testPopIfAvailable(f *DeltaFIFO) (testFifoObject, bool) {
obj := Pop(f)
if obj == nil {
return testFifoObject{}, false
}
return obj.(Deltas).Newest().Object.(testFifoObject), true
}
// literalListerGetter is a KeyListerGetter that is based on a
// function that returns a slice of objects to list and get.
// The function must list the same objects every time.
@ -306,6 +315,7 @@ func TestDeltaFIFOW_ReplaceMakesDeletionsForObjectsOnlyInQueue(t *testing.T) {
func TestDeltaFIFO_addUpdate(t *testing.T) {
f := NewDeltaFIFOWithOptions(DeltaFIFOOptions{KeyFunction: testFifoObjectKeyFunc})
defer f.Close()
f.Add(mkFifoObj("foo", 10))
f.Update(mkFifoObj("foo", 12))
f.Delete(mkFifoObj("foo", 15))
@ -320,7 +330,10 @@ func TestDeltaFIFO_addUpdate(t *testing.T) {
got := make(chan testFifoObject, 2)
go func() {
for {
obj := testPop(f)
obj, ok := testPopIfAvailable(f)
if !ok {
return
}
t.Logf("got a thing %#v", obj)
t.Logf("D len: %v", len(f.queue))
got <- obj
@ -471,12 +484,17 @@ func TestDeltaFIFO_enqueueingWithLister(t *testing.T) {
func TestDeltaFIFO_addReplace(t *testing.T) {
f := NewDeltaFIFOWithOptions(DeltaFIFOOptions{KeyFunction: testFifoObjectKeyFunc})
defer f.Close()
f.Add(mkFifoObj("foo", 10))
f.Replace([]interface{}{mkFifoObj("foo", 15)}, "0")
got := make(chan testFifoObject, 2)
go func() {
for {
got <- testPop(f)
obj, ok := testPopIfAvailable(f)
if !ok {
return
}
got <- obj
}
}()

14
tools/cache/fifo_test.go vendored
View File

@ -117,6 +117,7 @@ func TestFIFO_basic(t *testing.T) {
func TestFIFO_addUpdate(t *testing.T) {
f := NewFIFO(testFifoObjectKeyFunc)
defer f.Close()
f.Add(mkFifoObj("foo", 10))
f.Update(mkFifoObj("foo", 15))
@ -130,7 +131,11 @@ func TestFIFO_addUpdate(t *testing.T) {
got := make(chan testFifoObject, 2)
go func() {
for {
got <- Pop(f).(testFifoObject)
obj := Pop(f)
if obj == nil {
return
}
got <- obj.(testFifoObject)
}
}()
@ -151,12 +156,17 @@ func TestFIFO_addUpdate(t *testing.T) {
func TestFIFO_addReplace(t *testing.T) {
f := NewFIFO(testFifoObjectKeyFunc)
defer f.Close()
f.Add(mkFifoObj("foo", 10))
f.Replace([]interface{}{mkFifoObj("foo", 15)}, "15")
got := make(chan testFifoObject, 2)
go func() {
for {
got <- Pop(f).(testFifoObject)
obj := Pop(f)
if obj == nil {
return
}
got <- obj.(testFifoObject)
}
}()

10
tools/cache/main_test.go vendored
View File

@ -23,13 +23,5 @@ import (
)
func TestMain(m *testing.M) {
options := []goleak.Option{
// These tests run goroutines which get stuck in Pop.
// This cannot be fixed without modifying the API.
goleak.IgnoreAnyFunction("k8s.io/client-go/tools/cache.TestFIFO_addReplace.func1"),
goleak.IgnoreAnyFunction("k8s.io/client-go/tools/cache.TestFIFO_addUpdate.func1"),
goleak.IgnoreAnyFunction("k8s.io/client-go/tools/cache.TestDeltaFIFO_addReplace.func1"),
goleak.IgnoreAnyFunction("k8s.io/client-go/tools/cache.TestDeltaFIFO_addUpdate.func1"),
}
goleak.VerifyTestMain(m, options...)
goleak.VerifyTestMain(m)
}