Merge pull request #14323 from brendandburns/flakes2

Fix a flake in the kubelet test.
This commit is contained in:
Eric Tune 2015-09-22 13:36:22 -07:00
commit f92da0c714

View File

@ -337,6 +337,9 @@ func TestSyncLoopAbort(t *testing.T) {
kubelet := testKubelet.kubelet
kubelet.lastTimestampRuntimeUp = time.Now()
kubelet.networkConfigured = true
// The syncLoop waits on time.After(resyncInterval), set it really big so that we don't race for
// the channel close
kubelet.resyncInterval = time.Second * 30
ch := make(chan PodUpdate)
close(ch)