scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 11:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45323 from karataliu/NamespaceDeletionLogFix

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue
2017-05-04 16:47:38 -07:00
committed by GitHub
parent 78e08cf72d 78f929a433
commit 30575e521e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,12 +258,11 @@ func (f *Framework) AfterEach() {
} }
} }
} else { } else {
if TestContext.DeleteNamespace { if !TestContext.DeleteNamespace {
Logf("Found DeleteNamespace=false, skipping namespace deletion!") Logf("Found DeleteNamespace=false, skipping namespace deletion!")
} else if TestContext.DeleteNamespaceOnFailure { } else {
Logf("Found DeleteNamespaceOnFailure=false, skipping namespace deletion!") Logf("Found DeleteNamespaceOnFailure=false and current test failed, skipping namespace deletion!")
} }
} }
// Paranoia-- prevent reuse! // Paranoia-- prevent reuse!