Skip to content

Commit

Permalink
Merge pull request kubernetes#61725 from liggitt/pod-deletion-contention
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
Kubernetes Submit Queue authored May 3, 2018
2 parents ab9f64a + c0872d8 commit 1e9acb6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/e2e/node/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ var _ = SIGDescribe("Pods Extended", func() {
deleted := false
timeout := false
var lastPod *v1.Pod
timer := time.After(1 * time.Minute)
timer := time.After(2 * time.Minute)
for !deleted && !timeout {
select {
case event, _ := <-w.ResultChan():
Expand Down

0 comments on commit 1e9acb6

Please sign in to comment.