Merge pull request #16077 from enj/enj/i/panic_timed_workers_test/51704

Automatic merge from submit-queue (batch tested with PRs 16074, 16069, 16077, 16079, 16014) UPSTREAM: 51705: Address panic in TestCancelAndReadd This further increases the timeouts in timed_workers_test to reduce the chance of a race condition against the wait group. Signed-off-by: Monis Khan <[email protected]>
openshift · Sep 1, 2017 · a546bc2 · a546bc2
2 parents 16c4562 + 6a4c127
commit a546bc2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/timed_workers_test.go b/vendor/k8s.io/kubernetes/pkg/controller/node/timed_workers_test.go