github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

taint-controller-tests: double 'a bit of time' to avoid flakes

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-04-28 16:38:12 +02:00
parent 94567f64e1
commit 64aec01ac9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/node/taint_controller_test.go
View File

@ -31,6 +31,8 @@ import (
clienttesting "k8s.io/client-go/testing" clienttesting "k8s.io/client-go/testing"
) )
var timeForControllerToProgress = 500 * time.Millisecond
func createNoExecuteTaint(index int) v1.Taint { func createNoExecuteTaint(index int) v1.Taint {
return v1.Taint{ return v1.Taint{
Key: "testTaint" + fmt.Sprintf("%v", index), Key: "testTaint" + fmt.Sprintf("%v", index),
@ -154,7 +156,7 @@ func TestCreatePod(t *testing.T) {
controller.taintedNodes = item.taintedNodes controller.taintedNodes = item.taintedNodes
controller.PodUpdated(nil, item.pod) controller.PodUpdated(nil, item.pod)
// wait a bit // wait a bit
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
podDeleted := false podDeleted := false
for _, action := range fakeClientset.Actions() { for _, action := range fakeClientset.Actions() {
@ -180,7 +182,7 @@ func TestDeletePod(t *testing.T) {
} }
controller.PodUpdated(testutil.NewPod("pod1", "node1"), nil) controller.PodUpdated(testutil.NewPod("pod1", "node1"), nil)
// wait a bit to see if nothing will panic // wait a bit to see if nothing will panic
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
close(stopCh) close(stopCh)
} }
@ -242,10 +244,10 @@ func TestUpdatePod(t *testing.T) {
controller.PodUpdated(nil, item.prevPod) controller.PodUpdated(nil, item.prevPod)
fakeClientset.ClearActions() fakeClientset.ClearActions()
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
controller.PodUpdated(item.prevPod, item.newPod) controller.PodUpdated(item.prevPod, item.newPod)
// wait a bit // wait a bit
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
if item.additionalSleep > 0 { if item.additionalSleep > 0 {
time.Sleep(item.additionalSleep) time.Sleep(item.additionalSleep)
} }
@ -304,7 +306,7 @@ func TestCreateNode(t *testing.T) {
go controller.Run(stopCh) go controller.Run(stopCh)
controller.NodeUpdated(nil, item.node) controller.NodeUpdated(nil, item.node)
// wait a bit // wait a bit
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
podDeleted := false podDeleted := false
for _, action := range fakeClientset.Actions() { for _, action := range fakeClientset.Actions() {
@ -330,7 +332,7 @@ func TestDeleteNode(t *testing.T) {
go controller.Run(stopCh) go controller.Run(stopCh)
controller.NodeUpdated(testutil.NewNode("node1"), nil) controller.NodeUpdated(testutil.NewNode("node1"), nil)
// wait a bit to see if nothing will panic // wait a bit to see if nothing will panic
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
controller.taintedNodesLock.Lock() controller.taintedNodesLock.Lock()
if _, ok := controller.taintedNodes["node1"]; ok { if _, ok := controller.taintedNodes["node1"]; ok {
t.Error("Node should have been deleted from taintedNodes list") t.Error("Node should have been deleted from taintedNodes list")
@ -425,7 +427,7 @@ func TestUpdateNode(t *testing.T) {
go controller.Run(stopCh) go controller.Run(stopCh)
controller.NodeUpdated(item.oldNode, item.newNode) controller.NodeUpdated(item.oldNode, item.newNode)
// wait a bit // wait a bit
time.Sleep(200 * time.Millisecond) time.Sleep(timeForControllerToProgress)
if item.additionalSleep > 0 { if item.additionalSleep > 0 {
time.Sleep(item.additionalSleep) time.Sleep(item.additionalSleep)
} }