Merge pull request #121139 from bart0sh/PR123-e2e-move-node-rediness-check-to-DeferCleanup

e2e: move AllNodesReady check to DeferCleanup
This commit is contained in:
Kubernetes Prow Robot 2023-10-18 21:29:28 +02:00 committed by GitHub
commit 39d3580d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,14 +30,10 @@ import (
func init() {
framework.NewFrameworkExtensions = append(framework.NewFrameworkExtensions,
func(f *framework.Framework) {
ginkgo.AfterEach(func(ctx context.Context) {
if f.ClientSet == nil {
// Test didn't reach f.BeforeEach, most
// likely because the test got
// skipped. Nothing to check...
return
}
e2enode.AllNodesReady(ctx, f.ClientSet, 7*time.Minute)
ginkgo.BeforeEach(func() {
ginkgo.DeferCleanup(func(ctx context.Context) {
framework.ExpectNoError(e2enode.AllNodesReady(ctx, f.ClientSet, 7*time.Minute))
})
})
},
)