Skip to content

K
k3s
Commit d15de72a authored by Daniel Martí's avatar Daniel Martí
Browse files
Options

Fix race condition in controller_test

Our WaitGroup.Add() call might happen after some WaitGroup.Done() calls done by the controller, so make sure that doesn't happen by doing the Add() calls before letting the controller run. --- FAIL: TestUpdate (2.00s) panic: sync: WaitGroup is reused before previous Wait has returned [recovered] panic: sync: WaitGroup is reused before previous Wait has returned
parent 71ca503d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
pkg/controller/framework/controller_test.go
View file @ d15de72a
......@@ -335,10 +335,6 @@ func TestUpdate(t *testing.T) {
},
)
// Run the controller and run it until we close stop.
stop := make(chan struct{})
go controller.Run(stop)
pod := func(name, check string) *api.Pod {
return &api.Pod{
ObjectMeta: api.ObjectMeta{
......@@ -371,11 +367,18 @@ func TestUpdate(t *testing.T) {
},
}
// run every test a few times, in parallel
const threads = 3
testDoneWG.Add(threads * len(tests))
// Run the controller and run it until we close stop.
// Once Run() is called, calls to testDoneWG.Done() might start, so
// all testDoneWG.Add() calls must happen before this point
stop := make(chan struct{})
go controller.Run(stop)
// run every test a few times, in parallel
var wg sync.WaitGroup
wg.Add(threads * len(tests))
testDoneWG.Add(threads * len(tests))
for i := 0; i < threads; i++ {
for j, f := range tests {
go func(name string, f func(string)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment