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

remove redundant condition

Browse Source
This commit is contained in:
tanshanshan 2016-12-06 16:27:52 +08:00
parent da81f24323
commit c76cd49da1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubectl/cmd/drain_test.go
View File

@ -638,14 +638,13 @@ func TestDeletePods(t *testing.T) {
if _, ok := ifHasBeenCalled[name]; !ok { if _, ok := ifHasBeenCalled[name]; !ok {
ifHasBeenCalled[name] = true ifHasBeenCalled[name] = true
return &oldPod, nil return &oldPod, nil
} else {
if oldPod.ObjectMeta.Generation < 4 {
newPod := newPodMap[name]
return &newPod, nil
} else {
return nil, apierrors.NewNotFound(schema.GroupResource{Resource: "pods"}, name)
}
} }
if oldPod.ObjectMeta.Generation < 4 {
newPod := newPodMap[name]
return &newPod, nil
}
return nil, apierrors.NewNotFound(schema.GroupResource{Resource: "pods"}, name)
} }
return nil, apierrors.NewNotFound(schema.GroupResource{Resource: "pods"}, name) return nil, apierrors.NewNotFound(schema.GroupResource{Resource: "pods"}, name)
}, },
@ -662,7 +661,7 @@ func TestDeletePods(t *testing.T) {
if oldPod, found := oldPodMap[name]; found { if oldPod, found := oldPodMap[name]; found {
return &oldPod, nil return &oldPod, nil
} }
return nil, errors.New(fmt.Sprintf("%q: not found", name)) return nil, fmt.Errorf("%q: not found", name)
}, },
}, },
{ {