Fixing the AfterEach order

This commit is contained in:
nikhiljindal 2016-06-17 16:29:38 -07:00
parent 392ff36e29
commit 60f0dce033

View File

@ -34,8 +34,9 @@ import (
var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func() {
f := framework.NewDefaultFederatedFramework("federation-cluster")
Describe("Cluster objects", func() {
AfterEach(func() {
// framework.SkipUnlessFederated(f.Client) TODO: quinton-hoole: Temporarily disabled
framework.SkipUnlessFederated(f.Client)
// Delete registered clusters.
// This is if a test failed, it should not affect other tests.
@ -47,7 +48,7 @@ var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func
}
})
It("should allow creation and deletion of cluster api objects", func() {
It("should be created and deleted successfully", func() {
framework.SkipUnlessFederated(f.Client)
contexts := f.GetUnderlyingFederatedContexts()
@ -81,6 +82,7 @@ var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func
}
framework.Logf("Verified that zero clusters remain")
})
})
})
// Verify that the cluster is marked ready.