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:
Kubernetes Prow Robot 2022-03-24 12:19:04 -07:00 committed by GitHub
commit da7f184344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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 {