mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #95261 from sjenning/fix-pods-e2e
test: e2e: fix race in pods test
This commit is contained in:
commit
b2730aa483
@ -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{})
|
||||||
|
Loading…
Reference in New Issue
Block a user