github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13058 from mvdan/go1.5

Browse Source 
Race condition and test fixes
This commit is contained in:
Mike Danese
2015-09-10 15:10:19 -07:00
parent 381a723814 d15de72a92
commit b0457bee94
9 changed files with 105 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/controller/framework/controller_test.go
View File

@@ -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)) {