Merge pull request #36154 from m1093782566/m109-fix-del-ns

Automatic merge from submit-queue fix e2e delete namespace bug  **What:** Fix `CreateNamespace()` bug in `test/e2e/framework/framework.go`. **Why:** If we successfully create a namespace but fail to create a ServiceAccount in it, we should delete the namespace after test. The current implement of `CreateNamespace()` int e2e test will forget to delete the namespace which we fail to create serviceAccount in it(but the namespace has been successfully created!).

Merge pull request #36154 from m1093782566/m109-fix-del-ns
a2bf827e · Kubernetes Submit Queue · GitHub · c6191126 · 0b62cc7f · a2bf827e
Commit a2bf827e authored Nov 08, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

framework.go test/e2e/framework/framework.go +4 -1

util.go test/e2e/framework/util.go +4 -1

No files found.
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -445,7 +445,10 @@ func (f *Framework) CreateNamespace(baseName string, labels map[string]string) (
 		createTestingNS = CreateTestingNS
 	}
 	ns, err := createTestingNS(baseName, f.ClientSet, labels)
-	if err == nil {
+	// check ns instead of err to see if it's nil as we may
+	// fail to create serviceAccount in it.
+	// In this case, we should not forget to delete the namespace.
+	if ns != nil {
 		f.namespacesToDelete = append(f.namespacesToDelete, ns)
 	}
 	return ns, err

--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -916,7 +916,10 @@ func CreateTestingNS(baseName string, c clientset.Interface, labels map[string]s

 	if TestContext.VerifyServiceAccount {
 		if err := WaitForDefaultServiceAccountInNamespace(c, got.Name); err != nil {
-			return nil, err
+			// Even if we fail to create serviceAccount in the namespace,
+			// we have successfully create a namespace.
+			// So, return the created namespace.
+			return got, err
 		}
 	}
 	return got, nil