github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 05:46:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix mesos plugin-test race

Browse Source 
ListWatch returned the internal list of the MockPodsListWatch object, leading
to a race. Fixes travis builds.

Fixes mesosphere/kubernetes-mesos#354
This commit is contained in:
Dr. Stefan Schimanski 2015-06-15 07:47:28 +02:00
parent 5e5c1d1097
commit 615e4f99a7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mesos/pkg/scheduler/plugin_test.go
View File

@ -120,7 +120,11 @@ func NewMockPodsListWatch(initialPodList api.PodList) *MockPodsListWatch {
return lw.fakeWatcher, nil return lw.fakeWatcher, nil
}, },
ListFunc: func() (runtime.Object, error) { ListFunc: func() (runtime.Object, error) {
return &lw.list, nil lw.lock.Lock()
defer lw.lock.Unlock()
listCopy, err := api.Scheme.DeepCopy(&lw.list)
return listCopy.(*api.PodList), err
}, },
} }
return &lw return &lw