github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #61725 from liggitt/pod-deletion-contention 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Pod deletion can be contended, causing test failure

Observed this running e2e tests downstream

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-05-02 21:31:33 -07:00 committed by GitHub
parent ab9f64afa9 c0872d8ad6
commit 1e9acb63f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/node/pods.go
View File

@ -166,7 +166,7 @@ var _ = SIGDescribe("Pods Extended", func() {
deleted := false deleted := false
timeout := false timeout := false
var lastPod *v1.Pod var lastPod *v1.Pod
timer := time.After(1 * time.Minute) timer := time.After(2 * time.Minute)
for !deleted && !timeout { for !deleted && !timeout {
select { select {
case event, _ := <-w.ResultChan(): case event, _ := <-w.ResultChan():