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

Merge pull request #129420 from pohly/client-go-tools-cache-testhammercontroller-fix

Browse Source 
client-go cache: fix TestHammerController
This commit is contained in:
Kubernetes Prow Robot 2024-12-29 15:04:12 +01:00 committed by GitHub
commit 8f330c6368
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/client-go/tools/cache/controller_test.go vendored
View File

@ -232,7 +232,12 @@ func TestHammerController(t *testing.T) {
// Run the controller and run it until we cancel.
_, ctx := ktesting.NewTestContext(t)
ctx, cancel := context.WithCancel(ctx)
go controller.RunWithContext(ctx)
var controllerWG sync.WaitGroup
controllerWG.Add(1)
go func() {
defer controllerWG.Done()
controller.RunWithContext(ctx)
}()
// Let's wait for the controller to do its initial sync
wait.Poll(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) {
@ -293,8 +298,11 @@ func TestHammerController(t *testing.T) {
time.Sleep(100 * time.Millisecond)
cancel()
// TODO: Verify that no goroutines were leaked here and that everything shut
// down cleanly.
// Before we permanently lock this mutex, we have to be sure
// that the controller has stopped running. At this point,
// all goroutines should have stopped. Leak checking is
// done by TestMain.
controllerWG.Wait()
outputSetLock.Lock()
t.Logf("got: %#v", outputSet)