github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19959 from mesosphere/jdef_fix_k8s_19954_scheduler_integration_test

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-25 06:05:54 -08:00
parent 33d1f6c085 0b50f6c513
commit cc1eeeb7ca
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/mesos/pkg/scheduler/integration/integration_test.go
View File

@@ -198,13 +198,23 @@ func (lw *MockPodsListWatch) Pod(name string) *api.Pod {
for _, p := range lw.list.Items { for _, p := range lw.list.Items {
if p.Name == name { if p.Name == name {
return &p clone, err := api.Scheme.DeepCopy(&p)
if err != nil {
panic(err.Error())
}
return clone.(*api.Pod)
} }
} }
return nil return nil
} }
func (lw *MockPodsListWatch) Add(pod *api.Pod, notify bool) { func (lw *MockPodsListWatch) Add(pod *api.Pod, notify bool) {
clone, err := api.Scheme.DeepCopy(pod)
if err != nil {
panic(err.Error())
}
pod = clone.(*api.Pod)
func() { func() {
lw.lock.Lock() lw.lock.Lock()
defer lw.lock.Unlock() defer lw.lock.Unlock()
@@ -216,6 +226,12 @@ func (lw *MockPodsListWatch) Add(pod *api.Pod, notify bool) {
} }
} }
func (lw *MockPodsListWatch) Modify(pod *api.Pod, notify bool) { func (lw *MockPodsListWatch) Modify(pod *api.Pod, notify bool) {
clone, err := api.Scheme.DeepCopy(pod)
if err != nil {
panic("failed to clone pod object")
}
pod = clone.(*api.Pod)
found := false found := false
func() { func() {
lw.lock.Lock() lw.lock.Lock()