Merge pull request #45323 from karataliu/NamespaceDeletionLogFix

Automatic merge from submit-queue (batch tested with PRs 45364, 45369, 45323) Fix namespace deletion log in e2e test framework. **What this PR does / why we need it**: Current log message for namespace deletion will show under wrong condition. **Which issue this PR fixes** **Release note**: NONE

Merge pull request #45323 from karataliu/NamespaceDeletionLogFix
30575e52 · Kubernetes Submit Queue · GitHub · 78e08cf7 · 78f929a4 · 30575e52
Commit 30575e52 authored May 04, 2017 by Kubernetes Submit Queue Committed by GitHub May 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

No files found.
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -258,12 +258,11 @@ func (f *Framework) AfterEach() {
 				}
 			}
 		} else {
-			if TestContext.DeleteNamespace {
+			if !TestContext.DeleteNamespace {
 				Logf("Found DeleteNamespace=false, skipping namespace deletion!")
-			} else if TestContext.DeleteNamespaceOnFailure {
-				Logf("Found DeleteNamespaceOnFailure=false, skipping namespace deletion!")
+			} else {
+				Logf("Found DeleteNamespaceOnFailure=false and current test failed, skipping namespace deletion!")
 			}
-
 		}

 		// Paranoia-- prevent reuse!