github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21250 from wojtek-t/always_remove_namespace

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-15 10:33:05 -08:00
parent b1db8d3e9b ca7a9f855a
commit acb160739f
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
test/e2e/framework.go
View File

@@ -134,6 +134,31 @@ func (f *Framework) beforeEach() {
func (f *Framework) afterEach() { func (f *Framework) afterEach() {
RemoveCleanupAction(f.cleanupHandle) RemoveCleanupAction(f.cleanupHandle)
// DeleteNamespace at the very end in defer, to avoid any
// expectation failures preventing deleting the namespace.
defer func() {
if testContext.DeleteNamespace {
for _, ns := range f.namespacesToDelete {
By(fmt.Sprintf("Destroying namespace %q for this suite.", ns.Name))
timeout := 5 * time.Minute
if f.NamespaceDeletionTimeout != 0 {
timeout = f.NamespaceDeletionTimeout
}
if err := deleteNS(f.Client, ns.Name, timeout); err != nil {
Failf("Couldn't delete ns %q: %s", ns.Name, err)
}
}
f.namespacesToDelete = nil
} else {
Logf("Found DeleteNamespace=false, skipping namespace deletion!")
}
// Paranoia-- prevent reuse!
f.Namespace = nil
f.Client = nil
}()
// Print events if the test failed. // Print events if the test failed.
if CurrentGinkgoTestDescription().Failed { if CurrentGinkgoTestDescription().Failed {
By(fmt.Sprintf("Collecting events from namespace %q.", f.Namespace.Name)) By(fmt.Sprintf("Collecting events from namespace %q.", f.Namespace.Name))
@@ -178,23 +203,6 @@ func (f *Framework) afterEach() {
} }
} }
if testContext.DeleteNamespace {
for _, ns := range f.namespacesToDelete {
By(fmt.Sprintf("Destroying namespace %q for this suite.", ns.Name))
timeout := 5 * time.Minute
if f.NamespaceDeletionTimeout != 0 {
timeout = f.NamespaceDeletionTimeout
}
if err := deleteNS(f.Client, ns.Name, timeout); err != nil {
Failf("Couldn't delete ns %q: %s", ns.Name, err)
}
}
f.namespacesToDelete = nil
} else {
Logf("Found DeleteNamespace=false, skipping namespace deletion!")
}
outputTypes := strings.Split(testContext.OutputPrintType, ",") outputTypes := strings.Split(testContext.OutputPrintType, ",")
for _, printType := range outputTypes { for _, printType := range outputTypes {
switch printType { switch printType {
@@ -219,10 +227,6 @@ func (f *Framework) afterEach() {
if err := allNodesReady(f.Client, time.Minute); err != nil { if err := allNodesReady(f.Client, time.Minute); err != nil {
Failf("All nodes should be ready after test, %v", err) Failf("All nodes should be ready after test, %v", err)
} }
// Paranoia-- prevent reuse!
f.Namespace = nil
f.Client = nil
} }
func (f *Framework) CreateNamespace(baseName string, labels map[string]string) (*api.Namespace, error) { func (f *Framework) CreateNamespace(baseName string, labels map[string]string) (*api.Namespace, error) {