weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix e2e test addon deprovisioning order

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-04-29 21:12:16 +01:00
parent 41970407c6
commit 3948175427
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/framework/framework.go
View File

@ -152,6 +152,17 @@ func (f *Framework) AfterEach() {
f.printAddonLogs()
if !f.Config.Cleanup {
return
}
for i := len(f.requiredAddons) - 1; i >= 0; i-- {
a := f.requiredAddons[i]
By("De-provisioning test-scoped addon")
err := a.Deprovision()
Expect(err).NotTo(HaveOccurred())
}
By("Deleting test namespace")
err := f.DeleteKubeNamespace(f.Namespace.Name)
Expect(err).NotTo(HaveOccurred())
@ -209,14 +220,6 @@ func (f *Framework) RequireAddon(a addon.Addon) {
err = a.Provision()
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
if !f.Config.Cleanup {
return
}
err := a.Deprovision()
Expect(err).NotTo(HaveOccurred())
})
}
func (f *Framework) Helper() *helper.Helper {