Skip to content

Commit

Permalink
Merge pull request #55846 from mindprince/fix-defaulttolerationsecond…
Browse files Browse the repository at this point in the history
…s-test

Automatic merge from submit-queue (batch tested with PRs 55371, 55846). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix TestForgivenessAdmission.

This test would never fail because Annotations were empty in all cases!

This was missed when Tolerations were moved from Annotations to be part of Pod.Spec in #38957.

/kind bug
/sig scheduling

**Release note**:
```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue committed Nov 16, 2017
2 parents 2f2d494 + 7119fe2 commit 8823a83
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ func TestForgivenessAdmission(t *testing.T) {
t.Errorf("[%s]: unexpected error %v for pod %+v", test.description, err, test.requestedPod)
}

if !helper.Semantic.DeepEqual(test.expectedPod.Annotations, test.requestedPod.Annotations) {
t.Errorf("[%s]: expected %#v got %#v", test.description, test.expectedPod.Annotations, test.requestedPod.Annotations)
if !helper.Semantic.DeepEqual(test.expectedPod.Spec.Tolerations, test.requestedPod.Spec.Tolerations) {
t.Errorf("[%s]: expected %#v got %#v", test.description, test.expectedPod.Spec.Tolerations, test.requestedPod.Spec.Tolerations)
}
}
}
Expand Down

0 comments on commit 8823a83

Please sign in to comment.