github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122127 from dcbw/e2e-openapi-timeout

Browse Source 
e2e/openapi: fix test panic when OpenAPI CRD doesn't show up within timeout
This commit is contained in:
Kubernetes Prow Robot
2023-12-14 06:17:59 +01:00
committed by GitHub
parent 3c8241f4f3 a80c3d0301
commit 214d664e88
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/apimachinery/openapiv3.go
View File

@@ -134,13 +134,14 @@ var _ = SIGDescribe("OpenAPIV3", func() {
c := openapi3.NewRoot(f.ClientSet.Discovery().OpenAPIV3()) c := openapi3.NewRoot(f.ClientSet.Discovery().OpenAPIV3())
var openAPISpec *spec3.OpenAPI var openAPISpec *spec3.OpenAPI
// Poll for the OpenAPI to be updated with the new CRD // Poll for the OpenAPI to be updated with the new CRD
wait.Poll(time.Second*1, wait.ForeverTestTimeout, func() (bool, error) { err = wait.PollUntilContextTimeout(context.Background(), time.Second*1, wait.ForeverTestTimeout, false, func(context.Context) (bool, error) {
openAPISpec, err = c.GVSpec(gv) openAPISpec, err = c.GVSpec(gv)
if err == nil { if err == nil {
return true, nil return true, nil
} }
return false, nil return false, nil
}) })
framework.ExpectNoError(err, "timed out getting new CustomResourceDefinition")
specMarshalled, err := json.Marshal(openAPISpec) specMarshalled, err := json.Marshal(openAPISpec)
framework.ExpectNoError(err) framework.ExpectNoError(err)