mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-07 19:23:40 +00:00
Merge pull request #125825 from p0lyn0mial/upstream-apiextensions-deflake-integration-defaulting-test
apiextensions-apiserver/test/integration: deflake TestCustomResourceDefaultingWithoutWatchCache
This commit is contained in:
commit
2ede639e57
@ -376,8 +376,21 @@ func testDefaulting(t *testing.T, watchCache bool) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer w.Stop()
|
||||
select {
|
||||
case event := <-w.ResultChan():
|
||||
// since the RV we watch from can be compacted
|
||||
// during the execution of the test,
|
||||
// tolerate the expiration error.
|
||||
//
|
||||
// see: https://github.com/kubernetes/kubernetes/issues/125760
|
||||
if event.Type == watch.Error {
|
||||
if !apierrors.IsResourceExpired(apierrors.FromObject(event.Object)) {
|
||||
t.Fatalf("unexpected watch event: %v, %#v", event.Type, event.Object)
|
||||
}
|
||||
t.Logf("skipping the WATCH at RV = %s, because the revision has been compacetd, err: %#v", initialResourceVersion, event.Object)
|
||||
break
|
||||
}
|
||||
if event.Type != watch.Modified {
|
||||
t.Fatalf("unexpected watch event: %v, %#v", event.Type, event.Object)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user