Fix integration tests

Author: creydr

pkg/describer/integration_test_helper.go

@@ -14,7 +14,7 @@ import (
 	fnk8stest "knative.dev/func/pkg/testing/k8s"
 )
 
-func DescribeIntegrationTest(t *testing.T, describer fn.Describer, deployer fn.Deployer, remover fn.Remover) {
+func DescribeIntegrationTest(t *testing.T, describer fn.Describer, deployer fn.Deployer, remover fn.Remover, deployType string) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*10)
 	name := "func-int-knative-describe-" + rand.String(5)
 	root := t.TempDir()
@@ -36,6 +36,9 @@ func DescribeIntegrationTest(t *testing.T, describer fn.Describer, deployer fn.D
 		Runtime:   "go",
 		Namespace: ns,
 		Registry:  fntest.Registry(),
+		Deploy: fn.DeploySpec{
+			DeployType: deployType,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)

pkg/describer/k8s/integration_test.go

@@ -5,6 +5,7 @@ package k8s_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	k8sdeployer "knative.dev/func/pkg/deployer/k8s"
 	"knative.dev/func/pkg/describer"
 	k8sdescriber "knative.dev/func/pkg/describer/k8s"
@@ -15,5 +16,6 @@ func TestInt_Describe(t *testing.T) {
 	describer.DescribeIntegrationTest(t,
 		k8sdescriber.NewDescriber(true),
 		k8sdeployer.NewDeployer(k8sdeployer.WithDeployerVerbose(true)),
-		k8sremover.NewRemover(true))
+		k8sremover.NewRemover(true),
+		deployer.KubernetesDeployerName)
 }

pkg/describer/knative/integration_test.go

@@ -5,6 +5,7 @@ package knative_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	knativedeployer "knative.dev/func/pkg/deployer/knative"
 	"knative.dev/func/pkg/describer"
 	knativedescriber "knative.dev/func/pkg/describer/knative"
@@ -15,5 +16,6 @@ func TestInt_Describe(t *testing.T) {
 	describer.DescribeIntegrationTest(t,
 		knativedescriber.NewDescriber(true),
 		knativedeployer.NewDeployer(knativedeployer.WithDeployerVerbose(true)),
-		knativeremover.NewRemover(true))
+		knativeremover.NewRemover(true),
+		deployer.KnativeDeployerName)
 }

pkg/lister/integration_test_helper.go

@@ -14,7 +14,7 @@ import (
 	fnk8stest "knative.dev/func/pkg/testing/k8s"
 )
 
-func IntegrationTest(t *testing.T, lister fn.Lister, deployer fn.Deployer, describer fn.Describer, remover fn.Remover) {
+func IntegrationTest(t *testing.T, lister fn.Lister, deployer fn.Deployer, describer fn.Describer, remover fn.Remover, deployType string) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*10)
 	name := "func-int-knative-list-" + rand.String(5)
 	root := t.TempDir()
@@ -37,6 +37,9 @@ func IntegrationTest(t *testing.T, lister fn.Lister, deployer fn.Deployer, descr
 		Runtime:   "go",
 		Namespace: ns,
 		Registry:  fntest.Registry(),
+		Deploy: fn.DeploySpec{
+			DeployType: deployType,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -73,7 +76,7 @@ func IntegrationTest(t *testing.T, lister fn.Lister, deployer fn.Deployer, descr
 	}
 
 	// Verify with list
-	list, err := client.List(ctx, "")
+	list, err := client.List(ctx, ns)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/lister/k8s/integration_test.go

@@ -5,6 +5,7 @@ package k8s_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	k8sdeployer "knative.dev/func/pkg/deployer/k8s"
 	k8sdescriber "knative.dev/func/pkg/describer/k8s"
 	"knative.dev/func/pkg/lister"
@@ -20,5 +21,6 @@ func TestInt_List(t *testing.T) {
 			k8slister.NewGetter(true)),
 		k8sdeployer.NewDeployer(k8sdeployer.WithDeployerVerbose(true)),
 		k8sdescriber.NewDescriber(true),
-		k8sremover.NewRemover(true))
+		k8sremover.NewRemover(true),
+		deployer.KubernetesDeployerName)
 }

pkg/lister/knative/integration_test.go

@@ -5,6 +5,7 @@ package knative_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	knativedeployer "knative.dev/func/pkg/deployer/knative"
 	knativedescriber "knative.dev/func/pkg/describer/knative"
 	"knative.dev/func/pkg/lister"
@@ -20,5 +21,6 @@ func TestInt_List(t *testing.T) {
 			k8slister.NewGetter(true)),
 		knativedeployer.NewDeployer(knativedeployer.WithDeployerVerbose(true)),
 		knativedescriber.NewDescriber(true),
-		knativeremover.NewRemover(true))
+		knativeremover.NewRemover(true),
+		deployer.KnativeDeployerName)
 }

pkg/remover/integration_test_helper.go

@@ -14,7 +14,7 @@ import (
 	fnk8stest "knative.dev/func/pkg/testing/k8s"
 )
 
-func IntegrationTest(t *testing.T, remover fn.Remover, deployer fn.Deployer, describer fn.Describer, lister fn.Lister) {
+func IntegrationTest(t *testing.T, remover fn.Remover, deployer fn.Deployer, describer fn.Describer, lister fn.Lister, deployType string) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*10)
 	name := "func-int-knative-remove-" + rand.String(5)
 	root := t.TempDir()
@@ -37,6 +37,9 @@ func IntegrationTest(t *testing.T, remover fn.Remover, deployer fn.Deployer, des
 		Runtime:   "go",
 		Namespace: ns,
 		Registry:  fntest.Registry(),
+		Deploy: fn.DeploySpec{
+			DeployType: deployType,
+		},
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -67,7 +70,7 @@ func IntegrationTest(t *testing.T, remover fn.Remover, deployer fn.Deployer, des
 	}
 
 	// Verify with list
-	list, err := client.List(ctx, "")
+	list, err := client.List(ctx, ns)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -88,7 +91,7 @@ func IntegrationTest(t *testing.T, remover fn.Remover, deployer fn.Deployer, des
 	}
 
 	// Verify it is no longer listed
-	list, err = client.List(ctx, "")
+	list, err = client.List(ctx, ns)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/remover/k8s/integration_test.go

@@ -5,6 +5,7 @@ package k8s_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	k8sdescriber "knative.dev/func/pkg/describer/k8s"
 	"knative.dev/func/pkg/lister"
 	k8slister "knative.dev/func/pkg/lister/k8s"
@@ -19,5 +20,6 @@ func TestInt_Remove(t *testing.T) {
 		k8sremover.NewRemover(true),
 		k8sdeployer.NewDeployer(k8sdeployer.WithDeployerVerbose(true)),
 		k8sdescriber.NewDescriber(true),
-		lister.NewLister(true, nil, k8slister.NewGetter(true)))
+		lister.NewLister(true, nil, k8slister.NewGetter(true)),
+		deployer.KubernetesDeployerName)
 }

pkg/remover/knative/integration_test.go

@@ -5,6 +5,7 @@ package knative_test
 import (
 	"testing"
 
+	"knative.dev/func/pkg/deployer"
 	knativedescriber "knative.dev/func/pkg/describer/knative"
 	"knative.dev/func/pkg/lister"
 	knativelister "knative.dev/func/pkg/lister/knative"
@@ -19,5 +20,6 @@ func TestInt_Remove(t *testing.T) {
 		knativeremover.NewRemover(true),
 		knativedeployer.NewDeployer(knativedeployer.WithDeployerVerbose(true)),
 		knativedescriber.NewDescriber(true),
-		lister.NewLister(true, knativelister.NewGetter(true), nil))
+		lister.NewLister(true, knativelister.NewGetter(true), nil),
+		deployer.KnativeDeployerName)
 }