fix tests

aws · Feb 15, 2024 · 4307954 · 4307954
1 parent e5fd58a
commit 4307954
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/pkg/workflows/create_prep_test.go b/pkg/workflows/create_prep_test.go
@@ -95,7 +95,7 @@ func TestCreateNamespaceGetNamespaceFail(t *testing.T) {
 	namespace := "test-ns"
 
 	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
-	test.client.EXPECT().List(test.ctx, &corev1.NamespaceList{}).Return(fmt.Errorf(""))
+	test.client.EXPECT().List(test.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).Return(fmt.Errorf(""))
 
 	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)
 
@@ -110,7 +110,7 @@ func TestCreateNamespaceFail(t *testing.T) {
 	namespace := "test-ns"
 
 	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
-	test.client.EXPECT().List(test.ctx, &corev1.NamespaceList{}).Return(nil)
+	test.client.EXPECT().List(test.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).Return(nil)
 	test.client.EXPECT().Create(test.ctx, newNamespace(namespace)).Return(fmt.Errorf(""))
 
 	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)

diff --git a/pkg/workflows/management/create_test.go b/pkg/workflows/management/create_test.go
@@ -262,9 +262,16 @@ func (c *createTestSetup) expectWriteClusterConfig() {
 }
 
 func (c *createTestSetup) expectCreateNamespace() {
-	ns := c.clusterSpec.Cluster.Namespace
-	c.client.EXPECT().Get(c.ctx, ns, "", &corev1.Namespace{}).MaxTimes(2)
-	c.client.EXPECT().Create(c.ctx, &corev1.Namespace{ObjectMeta: v1.ObjectMeta{Name: ns}}).MaxTimes(2)
+	n := c.clusterSpec.Cluster.Namespace
+	ns := &corev1.Namespace{
+		TypeMeta: v1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Namespace",
+		},
+		ObjectMeta: v1.ObjectMeta{Name: n},
+	}
+	c.client.EXPECT().List(c.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).MaxTimes(2)
+	c.client.EXPECT().Create(c.ctx, ns).MaxTimes(2)
 }
 
 func (c *createTestSetup) expectDeleteBootstrap(err error) {

diff --git a/pkg/workflows/workload/create_test.go b/pkg/workflows/workload/create_test.go
@@ -118,9 +118,16 @@ func (c *createTestSetup) expectSetup() {
 }
 
 func (c *createTestSetup) expectCreateNamespace() {
-	ns := c.clusterSpec.Cluster.Namespace
-	c.client.EXPECT().Get(c.ctx, ns, "", &corev1.Namespace{}).MaxTimes(2)
-	c.client.EXPECT().Create(c.ctx, &corev1.Namespace{ObjectMeta: v1.ObjectMeta{Name: ns}}).MaxTimes(2)
+	n := c.clusterSpec.Cluster.Namespace
+	ns := &corev1.Namespace{
+		TypeMeta: v1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Namespace",
+		},
+		ObjectMeta: v1.ObjectMeta{Name: n},
+	}
+	c.client.EXPECT().List(c.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).MaxTimes(2)
+	c.client.EXPECT().Create(c.ctx, ns).MaxTimes(2)
 }
 
 func (c *createTestSetup) expectCreateWorkloadCluster(err1, err2 error) {