pkg/test: make namespace flags work correctly

operator-framework · Aug 3, 2018 · ce9e21b · ce9e21b
1 parent 52202fd
commit ce9e21b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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 change
@@ Expand Up / @@ -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,
     	}
     }
@@ Expand Down @@