github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114392 from pohly/e2e-apimachinery-cleanup

Browse Source 
e2e apimachinery: simplify cleanup
This commit is contained in:
Kubernetes Prow Robot 2022-12-10 09:06:31 -08:00 committed by GitHub
commit 63ff4a2659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/apimachinery/aggregator.go
View File

@ -57,18 +57,8 @@ const (
) )
var _ = SIGDescribe("Aggregator", func() { var _ = SIGDescribe("Aggregator", func() {
var ns string
var c clientset.Interface
var aggrclient *aggregatorclient.Clientset var aggrclient *aggregatorclient.Clientset
// BeforeEachs run in LIFO order, AfterEachs run in FIFO order.
// We want cleanTest to happen before the namespace cleanup AfterEach
// inserted by NewDefaultFramework, so we put this AfterEach in front
// of NewDefaultFramework.
ginkgo.AfterEach(func() {
cleanTest(c, aggrclient, ns)
})
f := framework.NewDefaultFramework("aggregator") f := framework.NewDefaultFramework("aggregator")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline f.NamespacePodSecurityEnforceLevel = admissionapi.LevelBaseline
@ -76,10 +66,6 @@ var _ = SIGDescribe("Aggregator", func() {
// NewDefaultFramework to happen before this, so we put this BeforeEach // NewDefaultFramework to happen before this, so we put this BeforeEach
// after NewDefaultFramework. // after NewDefaultFramework.
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
c = f.ClientSet
ns = f.Namespace.Name
if aggrclient == nil {
config, err := framework.LoadConfig() config, err := framework.LoadConfig()
if err != nil { if err != nil {
framework.Failf("could not load config: %v", err) framework.Failf("could not load config: %v", err)
@ -88,7 +74,7 @@ var _ = SIGDescribe("Aggregator", func() {
if err != nil { if err != nil {
framework.Failf("could not create aggregator client: %v", err) framework.Failf("could not create aggregator client: %v", err)
} }
} ginkgo.DeferCleanup(cleanTest, f.ClientSet, aggrclient, f.Namespace.Name)
}) })
/* /*