From bff54a93340dc61471c6211844ee8d14688bac98 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 15 Dec 2017 19:01:28 +0000 Subject: [PATCH] Do not use AddCleanup --- test/e2e/apimachinery/aggregator.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 02317e204c0..e91fd69130d 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -53,12 +53,6 @@ var _ = SIGDescribe("Aggregator", func() { var c clientset.Interface var aggrclient *aggregatorclient.Clientset f := framework.NewDefaultFramework("aggregator") - framework.AddCleanupAction(func() { - // Cleanup actions will be called even when the tests are skipped and leaves namespace unset. - if len(ns) > 0 { - cleanTest(c, aggrclient, ns) - } - }) BeforeEach(func() { c = f.ClientSet @@ -66,6 +60,10 @@ var _ = SIGDescribe("Aggregator", func() { aggrclient = f.AggregatorClient }) + AfterEach(func() { + cleanTest(c, aggrclient, ns) + }) + It("Should be able to support the 1.7 Sample API Server using the current Aggregator", func() { // Make sure the relevant provider supports Agggregator framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery())