github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Kevin
2017-01-24 01:33:33 +08:00
parent 36dcb57407
commit 6a2ef1646b
2 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/api/v1/helpers_test.go
View File

@@ -445,18 +445,18 @@ func TestTolerationToleratesTaint(t *testing.T) {
func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
testCases := []struct {
description string
tolerations []Toleration
taints []Taint
isInterestingTaint taintsFilterFunc
expectTolerated bool
description string
tolerations []Toleration
taints []Taint
applyFilter taintsFilterFunc
expectTolerated bool
}{
{
description: "empty tolerations tolerate empty taints",
tolerations: []Toleration{},
taints: []Taint{},
isInterestingTaint: func(t *Taint) bool { return true },
expectTolerated: true,
description: "empty tolerations tolerate empty taints",
tolerations: []Toleration{},
taints: []Taint{},
applyFilter: func(t *Taint) bool { return true },
expectTolerated: true,
},
{
description: "non-empty tolerations tolerate empty taints",
@@ -467,9 +467,9 @@ func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
Effect: TaintEffectNoSchedule,
},
},
taints: []Taint{},
isInterestingTaint: func(t *Taint) bool { return true },
expectTolerated: true,
taints: []Taint{},
applyFilter: func(t *Taint) bool { return true },
expectTolerated: true,
},
{
description: "tolerations match all taints, expect tolerated",
@@ -486,11 +486,11 @@ func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
Effect: TaintEffectNoSchedule,
},
},
isInterestingTaint: func(t *Taint) bool { return true },
expectTolerated: true,
applyFilter: func(t *Taint) bool { return true },
expectTolerated: true,
},
{
description: "tolerations don't match taints, but no taint is interested, expect tolerated",
description: "tolerations don't match taints, but no taints apply to the filter, expect tolerated",
tolerations: []Toleration{
{
Key: "foo",
@@ -504,11 +504,11 @@ func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
Effect: TaintEffectNoSchedule,
},
},
isInterestingTaint: func(t *Taint) bool { return false },
expectTolerated: true,
applyFilter: func(t *Taint) bool { return false },
expectTolerated: true,
},
{
description: "no isInterestedTaint indicated, means all taints are interested, tolerations don't match taints, expect untolerated",
description: "no filterFunc indicated, means all taints apply to the filter, tolerations don't match taints, expect untolerated",
tolerations: []Toleration{
{
Key: "foo",
@@ -522,11 +522,11 @@ func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
Effect: TaintEffectNoSchedule,
},
},
isInterestingTaint: nil,
expectTolerated: false,
applyFilter: nil,
expectTolerated: false,
},
{
description: "tolerations match interested taints, expect tolerated",
description: "tolerations match taints, expect tolerated",
tolerations: []Toleration{
{
Key: "foo",
@@ -544,16 +544,16 @@ func TestTolerationsTolerateTaintsWithFilter(t *testing.T) {
Effect: TaintEffectNoSchedule,
},
},
isInterestingTaint: func(t *Taint) bool { return t.Effect == TaintEffectNoExecute },
expectTolerated: true,
applyFilter: func(t *Taint) bool { return t.Effect == TaintEffectNoExecute },
expectTolerated: true,
},
}
for _, tc := range testCases {
if tc.expectTolerated != TolerationsTolerateTaintsWithFilter(tc.tolerations, tc.taints, tc.isInterestingTaint) {
if tc.expectTolerated != TolerationsTolerateTaintsWithFilter(tc.tolerations, tc.taints, tc.applyFilter) {
filteredTaints := []Taint{}
for _, taint := range tc.taints {
if tc.isInterestingTaint != nil && !tc.isInterestingTaint(&taint) {
if tc.applyFilter != nil && !tc.applyFilter(&taint) {
continue
}
filteredTaints = append(filteredTaints, taint)