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

Merge pull request #51062 from alrs/fix-statefulset-test-swallowed-errors

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50980, 46902, 51051, 51062, 51020)

Fix swallowed errors in statefulset tests

**What this PR does / why we need it**: Fixes errors that were being swallowed in the tests of the statefulset package.

```release-note NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-22 23:14:05 -07:00 committed by GitHub
commit 57ab7c6a64
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/statefulset/stateful_set_control_test.go
View File

@ -474,6 +474,9 @@ func TestStatefulSetControl_getSetRevisions(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
current, update, _, err := ssc.getStatefulSetRevisions(test.set, revisions) current, update, _, err := ssc.getStatefulSetRevisions(test.set, revisions)
if err != nil {
t.Fatalf("error getting statefulset revisions:%v", err)
}
revisions, err = ssc.ListRevisions(test.set) revisions, err = ssc.ListRevisions(test.set)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

13
pkg/controller/statefulset/stateful_set_test.go
View File

@ -615,6 +615,9 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl
} }
for set.Status.ReadyReplicas < *set.Spec.Replicas { for set.Status.ReadyReplicas < *set.Spec.Replicas {
pods, err := spc.podsLister.Pods(set.Namespace).List(selector) pods, err := spc.podsLister.Pods(set.Namespace).List(selector)
if err != nil {
return err
}
ord := len(pods) - 1 ord := len(pods) - 1
pod := getPodAtOrdinal(pods, ord) pod := getPodAtOrdinal(pods, ord)
if pods, err = spc.setPodPending(set, ord); err != nil { if pods, err = spc.setPodPending(set, ord); err != nil {
@ -669,6 +672,9 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
ssc.enqueueStatefulSet(set) ssc.enqueueStatefulSet(set)
fakeWorker(ssc) fakeWorker(ssc)
pods, err = spc.addTerminatingPod(set, ord) pods, err = spc.addTerminatingPod(set, ord)
if err != nil {
return err
}
pod = getPodAtOrdinal(pods, ord) pod = getPodAtOrdinal(pods, ord)
ssc.updatePod(&prev, pod) ssc.updatePod(&prev, pod)
fakeWorker(ssc) fakeWorker(ssc)
@ -677,8 +683,15 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
fakeWorker(ssc) fakeWorker(ssc)
for set.Status.Replicas > *set.Spec.Replicas { for set.Status.Replicas > *set.Spec.Replicas {
pods, err = spc.podsLister.Pods(set.Namespace).List(selector) pods, err = spc.podsLister.Pods(set.Namespace).List(selector)
if err != nil {
return err
}
ord := len(pods) ord := len(pods)
pods, err = spc.addTerminatingPod(set, ord) pods, err = spc.addTerminatingPod(set, ord)
if err != nil {
return err
}
pod = getPodAtOrdinal(pods, ord) pod = getPodAtOrdinal(pods, ord)
ssc.updatePod(&prev, pod) ssc.updatePod(&prev, pod)
fakeWorker(ssc) fakeWorker(ssc)