pkg/test: make namespace flags work correctly

AlexNPavel · AlexNPavel · commit ce9e21b2be1e · 2018-08-03T10:20:21.000-07:00
diff --git a/pkg/test/context.go b/pkg/test/context.go
@@ -46,8 +46,7 @@ func (f *Framework) NewTestCtx(t *testing.T) TestCtx {
 
 	id := prefix + "-" + strconv.FormatInt(time.Now().Unix(), 10)
 	return TestCtx{
-		ID:        id,
-		Namespace: *f.Namespace,
+		ID: id,
 	}
 }
 
diff --git a/pkg/test/resource_creator.go b/pkg/test/resource_creator.go
@@ -53,7 +53,9 @@ func (ctx *TestCtx) GetNamespace() (string, error) {
 	}
 	namespaceObj := &core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ctx.Namespace}}
 	_, err := Global.KubeClient.CoreV1().Namespaces().Create(namespaceObj)
-	if err != nil {
+	if apierrors.IsAlreadyExists(err) {
+		return ctx.Namespace, nil
+	} else if err != nil {
 		return "", err
 	}
 	ctx.AddFinalizerFn(func() error {

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ func (f Framework) NewTestCtx(t testing.T) TestCtx {`
`46`	`46`
`47`	`47`	`id := prefix + "-" + strconv.FormatInt(time.Now().Unix(), 10)`
`48`	`48`	`return TestCtx{`
`49`		`- ID: id,`
`50`		`- Namespace: *f.Namespace,`
	`49`	`+ ID: id,`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ func (ctx *TestCtx) GetNamespace() (string, error) {`
`53`	`53`	`}`
`54`	`54`	`namespaceObj := &core.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ctx.Namespace}}`
`55`	`55`	`_, err := Global.KubeClient.CoreV1().Namespaces().Create(namespaceObj)`
`56`		`- if err != nil {`
	`56`	`+ if apierrors.IsAlreadyExists(err) {`
	`57`	`+ return ctx.Namespace, nil`
	`58`	`+ } else if err != nil {`
`57`	`59`	`return "", err`
`58`	`60`	`}`
`59`	`61`	`ctx.AddFinalizerFn(func() error {`