Allow the -delete-namespace flag to work on origin tests

smarterclayton · smarterclayton · commit 360d99f87673 · 2018-06-24T23:41:10.000-04:00
Regressed when we started using our own logic.
diff --git a/test/extended/util/cli.go b/test/extended/util/cli.go
@@ -210,7 +210,7 @@ func (c *CLI) TeardownProject() {
 	if len(c.configPath) > 0 {
 		os.Remove(c.configPath)
 	}
-	if len(c.namespacesToDelete) > 0 {
+	if e2e.TestContext.DeleteNamespace && len(c.namespacesToDelete) > 0 {
 		timeout := e2e.DefaultNamespaceDeletionTimeout
 		if c.kubeFramework.NamespaceDeletionTimeout != 0 {
 			timeout = c.kubeFramework.NamespaceDeletionTimeout

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ func (c *CLI) TeardownProject() {`
`210`	`210`	`if len(c.configPath) > 0 {`
`211`	`211`	`os.Remove(c.configPath)`
`212`	`212`	`}`
`213`		`- if len(c.namespacesToDelete) > 0 {`
	`213`	`+ if e2e.TestContext.DeleteNamespace && len(c.namespacesToDelete) > 0 {`
`214`	`214`	`timeout := e2e.DefaultNamespaceDeletionTimeout`
`215`	`215`	`if c.kubeFramework.NamespaceDeletionTimeout != 0 {`
`216`	`216`	`timeout = c.kubeFramework.NamespaceDeletionTimeout`