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

Merge pull request #95261 from sjenning/fix-pods-e2e

Browse Source 
test: e2e: fix race in pods test
This commit is contained in:
Kubernetes Prow Robot 2020-10-02 21:47:04 -07:00 committed by GitHub
commit b2730aa483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,6 +263,7 @@ var _ = SIGDescribe("Pods Extended", func() {
start := time.Now() start := time.Now()
created := podClient.Create(pod) created := podClient.Create(pod)
ch := make(chan []watch.Event) ch := make(chan []watch.Event)
waitForWatch := make(chan struct{})
go func() { go func() {
defer ginkgo.GinkgoRecover() defer ginkgo.GinkgoRecover()
defer close(ch) defer close(ch)
@ -275,6 +276,7 @@ var _ = SIGDescribe("Pods Extended", func() {
return return
} }
defer w.Stop() defer w.Stop()
close(waitForWatch)
events := []watch.Event{ events := []watch.Event{
{Type: watch.Added, Object: created}, {Type: watch.Added, Object: created},
} }
@ -291,6 +293,10 @@ var _ = SIGDescribe("Pods Extended", func() {
ch <- events ch <- events
}() }()
select {
case <-ch: // in case the goroutine above exits before establishing the watch
case <-waitForWatch: // when the watch is established
}
t := time.Duration(rand.Intn(delay)) * time.Millisecond t := time.Duration(rand.Intn(delay)) * time.Millisecond
time.Sleep(t) time.Sleep(t)
err := podClient.Delete(context.TODO(), pod.Name, metav1.DeleteOptions{}) err := podClient.Delete(context.TODO(), pod.Name, metav1.DeleteOptions{})