From fbcc3c183a46b6bed5cd805c88a59429e885d07d Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 17 Oct 2019 01:25:12 -0700 Subject: [PATCH] Ensure TaintBasedEviction int test not rely on TaintNodeByConditions --- test/integration/scheduler/taint_test.go | 2 +- test/integration/scheduler/util.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/scheduler/taint_test.go b/test/integration/scheduler/taint_test.go index cd5086453b0e..74a21c81daa0 100644 --- a/test/integration/scheduler/taint_test.go +++ b/test/integration/scheduler/taint_test.go @@ -689,7 +689,7 @@ func TestTaintBasedEvictions(t *testing.T) { 0.55, // Unhealthy zone threshold true, // Run taint manager true, // Use taint based evictions - false, // Enabled TaintNodeByCondition feature + true, // Enabled TaintNodeByCondition feature ) if err != nil { t.Errorf("Failed to create node controller: %v", err) diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index 852a5fc9cacd..49df2cb1f54e 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -381,7 +381,8 @@ func nodeTainted(cs clientset.Interface, nodeName string, taints []v1.Taint) wai return false, err } - if len(taints) != len(node.Spec.Taints) { + // node.Spec.Taints may have more taints + if len(taints) > len(node.Spec.Taints) { return false, nil }