tests: fix pinp tests

Prior to this, they may affect the other tests (mainly examples one).

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

test/pipelinerun_pinp_test.go

@@ -29,12 +29,19 @@ import (
 	th "github.com/tektoncd/pipeline/pkg/reconciler/testing"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	knativetest "knative.dev/pkg/test"
 )
 
-func TestPipelineRun_OneChildPipelineRunFromPipelineSpec(t *testing.T) {
-	ctx, cancel, c, namespace := setupPinP(t)
+func TestPipelineRun_PinP_OneChildPipelineRunFromPipelineSpec(t *testing.T) {
+	t.Parallel()
+	ctx := t.Context()
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
-	defer tearDownOptDump(ctx, t, c, namespace, true)
+	c, namespace := setup(ctx, t, requireAnyGate(map[string]string{
+		"enable-api-fields": "alpha",
+	}))
+	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
+	defer tearDown(ctx, t, c, namespace)
 
 	// GIVEN
 	t.Logf("Setting up test resources for one child PipelineRun from PipelineSpec in namespace %q", namespace)
@@ -100,10 +107,16 @@ func assertPinP(
 	checkAnnotationPropagationToChildPipelineRun(ctx, t, c, namespace, directParentPrName, actualCpr)
 }
 
-func TestPipelineRun_TwoChildPipelineRunsMixedTasks(t *testing.T) {
-	ctx, cancel, c, namespace := setupPinP(t)
+func TestPipelineRun_PinP_TwoChildPipelineRunsMixedTasks(t *testing.T) {
+	t.Parallel()
+	ctx := t.Context()
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
-	defer tearDownOptDump(ctx, t, c, namespace, true)
+	c, namespace := setup(ctx, t, requireAnyGate(map[string]string{
+		"enable-api-fields": "alpha",
+	}))
+	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
+	defer tearDown(ctx, t, c, namespace)
 
 	// GIVEN
 	t.Logf("Setting up test resources for two child PipelineRuns (mixed tasks) in namespace %q", namespace)
@@ -124,10 +137,16 @@ func TestPipelineRun_TwoChildPipelineRunsMixedTasks(t *testing.T) {
 	assertEvents(ctx, t, expectedEventsAmount, expectedKinds, c, namespace)
 }
 
-func TestPipelineRun_TwoLevelDeepNestedChildPipelineRuns(t *testing.T) {
-	ctx, cancel, c, namespace := setupPinP(t)
+func TestPipelineRun_PinP_TwoLevelDeepNestedChildPipelineRuns(t *testing.T) {
+	t.Parallel()
+	ctx := t.Context()
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
-	defer tearDownOptDump(ctx, t, c, namespace, true)
+	c, namespace := setup(ctx, t, requireAnyGate(map[string]string{
+		"enable-api-fields": "alpha",
+	}))
+	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
+	defer tearDown(ctx, t, c, namespace)
 
 	// GIVEN
 	t.Logf("Setting up test resources for two level deep nested child PipelineRuns in namespace %q", namespace)

test/util.go

@@ -95,31 +95,6 @@ func setup(ctx context.Context, t *testing.T, fn ...func(context.Context, *testi
 	return c, namespace
 }
 
-func setupPinP(t *testing.T) (context.Context, context.CancelFunc, *clients, string) {
-	t.Helper()
-
-	t.Parallel()
-	ctx := t.Context()
-	ctx, cancel := context.WithCancel(ctx)
-	c, namespace := setup(ctx, t)
-
-	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
-
-	t.Log("Activating alpha feature flags")
-	configMapData := map[string]string{"enable-api-fields": "alpha"}
-	if err := updateConfigMap(
-		ctx,
-		c.KubeClient,
-		system.Namespace(),
-		config.GetFeatureFlagsConfigName(),
-		configMapData,
-	); err != nil {
-		t.Fatal(err)
-	}
-
-	return ctx, cancel, c, namespace
-}
-
 func header(t *testing.T, text string) {
 	t.Helper()
 	left := "### "
@@ -166,17 +141,6 @@ func tearDown(ctx context.Context, t *testing.T, cs *clients, namespace string)
 	}
 }
 
-// tearDownNoDump prevents dumping Task/Pipeline/PipelineRun/TaskRun yamls to the terminal
-// when a test fails. Useful for investigating issues from terminal logs without the
-// need to scroll over all the deployed resource yamls.
-func tearDownOptDump(ctx context.Context, t *testing.T, c *clients, namespace string, dump bool) {
-	t.Helper()
-	if !dump {
-		c.KubeClient = nil
-	}
-	tearDown(ctx, t, c, namespace)
-}
-
 func initializeLogsAndMetrics(t *testing.T) {
 	t.Helper()
 	initMetrics.Do(func() {