mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-11 21:12:07 +00:00
Merge pull request #108934 from stevekuznetsov/skuznets/time-out-test
pkg/storage/etcd3: update test to time out, not panic
This commit is contained in:
commit
da7f184344
@ -299,9 +299,20 @@ func TestWatchDeleteEventObjectHaveLatestRV(t *testing.T) {
|
||||
t.Fatalf("Delete failed: %v", err)
|
||||
}
|
||||
|
||||
e := <-w.ResultChan()
|
||||
var e watch.Event
|
||||
var wres clientv3.WatchResponse
|
||||
watchCtx, _ := context.WithTimeout(ctx, wait.ForeverTestTimeout)
|
||||
select {
|
||||
case e = <-w.ResultChan():
|
||||
case <-watchCtx.Done():
|
||||
t.Fatalf("timed out waiting for watch event")
|
||||
}
|
||||
select {
|
||||
case wres = <-etcdW:
|
||||
case <-watchCtx.Done():
|
||||
t.Fatalf("timed out waiting for raw watch event")
|
||||
}
|
||||
watchedDeleteObj := e.Object.(*example.Pod)
|
||||
wres := <-etcdW
|
||||
|
||||
watchedDeleteRev, err := store.versioner.ParseResourceVersion(watchedDeleteObj.ResourceVersion)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user