github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/framework/node/init/init.go
View File

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