kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108934 from stevekuznetsov/skuznets/time-out-test 

pkg/storage/etcd3: update test to time out, not panic

Kubernetes-commit: da7f184344d841807c2da88a92ee96e1de32d97b
This commit is contained in:
Kubernetes Publisher 2022-03-24 12:19:04 -07:00
parent 5e6d6631a4 25c879eec5
commit 96bc51835b
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -46,7 +46,7 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20220324090948-252596ff4b82
k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34
k8s.io/client-go v0.0.0-20220324091244-cf06297a8914
k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b
k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220316025549-ddc66922ab18
@ -60,6 +60,6 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220324090948-252596ff4b82
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34
k8s.io/client-go => k8s.io/client-go v0.0.0-20220324091244-cf06297a8914
k8s.io/client-go => k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b
k8s.io/component-base => k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388
)

4
go.sum
View File

@ -958,8 +958,8 @@ k8s.io/api v0.0.0-20220324090948-252596ff4b82 h1:JzyceRELIVLSbRvRGVMFsBF3TMLz654
k8s.io/api v0.0.0-20220324090948-252596ff4b82/go.mod h1:JqmWcTc8w/f9H6FAID3aXgcs3r23s/WDUoSYelnyMzU=
k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34 h1:SsC1YncL6JXgQ58/38HUQNgloOpepqST88xg7uqNAGQ=
k8s.io/apimachinery v0.0.0-20220324090745-7300632adf34/go.mod h1:PgkO8eNLIN6yNjdRAueHZRbNd08wHC7Y40ooODLbuWA=
k8s.io/client-go v0.0.0-20220324091244-cf06297a8914 h1:sZmStpP3DluFJm0ySjLiqs33sd2zQoC6TH98/ydCjHk=
k8s.io/client-go v0.0.0-20220324091244-cf06297a8914/go.mod h1:7gIIunmAuzeVK4wOc0IIHmTphO31irvImN4hratKEwQ=
k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b h1:VXWs1cwIE6JpgSM5neWBBkyNJtTNMhqHKzbJreCF09o=
k8s.io/client-go v0.0.0-20220324171229-f4f092dbe05b/go.mod h1:7gIIunmAuzeVK4wOc0IIHmTphO31irvImN4hratKEwQ=
k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388 h1:TDzZ//+QLGQsNKxK4N5Fq6W0cFoR6PbOp8/FyfmhNTw=
k8s.io/component-base v0.0.0-20220324091809-1ed05ebc2388/go.mod h1:3mhEYZ85I6PjKzStvGIhq74eHrW7WTLy7uOzuih/n1s=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

15
pkg/storage/etcd3/watcher_test.go
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 {