github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 09:47:06 +00:00
Code Issues Projects Releases Wiki Activity

Do not use AddCleanup

Browse Source
This commit is contained in:
Lantao Liu
2017-12-15 19:01:28 +00:00
parent 761fdeacaa
commit bff54a9334
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,12 +53,6 @@ var _ = SIGDescribe("Aggregator", func() {
var c clientset.Interface var c clientset.Interface
var aggrclient *aggregatorclient.Clientset var aggrclient *aggregatorclient.Clientset
f := framework.NewDefaultFramework("aggregator") 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() { BeforeEach(func() {
c = f.ClientSet c = f.ClientSet
@@ -66,6 +60,10 @@ var _ = SIGDescribe("Aggregator", func() {
aggrclient = f.AggregatorClient 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() { It("Should be able to support the 1.7 Sample API Server using the current Aggregator", func() {
// Make sure the relevant provider supports Agggregator // Make sure the relevant provider supports Agggregator
framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery()) framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery())