fix k8s event flaky test with new fakerecorder

pkg/controller/filter_test.go

@@ -24,9 +24,9 @@ import (
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	fakeruninformer "github.com/tektoncd/pipeline/pkg/client/injection/informers/pipeline/v1alpha1/run/fake"
 	"github.com/tektoncd/pipeline/pkg/controller"
+	eventstest "github.com/tektoncd/pipeline/test/events"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	rtesting "knative.dev/pkg/reconciler/testing"
 )
 
 const (
@@ -462,7 +462,7 @@ func TestFilterOwnerRunRef(t *testing.T) {
 		want: false,
 	}} {
 		t.Run(c.desc, func(t *testing.T) {
-			ctx, _ := rtesting.SetupFakeContext(t)
+			ctx, _ := eventstest.SetupFakeContext(t)
 			runInformer := fakeruninformer.Get(ctx)
 			if c.owner != nil {
 				if err := runInformer.Informer().GetIndexer().Add(c.owner); err != nil {

pkg/reconciler/customrun/customrun_test.go

@@ -33,7 +33,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	cminformer "knative.dev/pkg/configmap/informer"
@@ -65,7 +64,7 @@ func initializeCustomRunControllerAssets(t *testing.T, d test.Data) (test.Assets
 		Controller: ctl,
 		Clients:    c,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }

pkg/reconciler/events/cloudevent/cloud_event_controller_test.go

@@ -29,13 +29,11 @@ import (
 	eventstest "github.com/tektoncd/pipeline/test/events"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/record"
 	clock "k8s.io/utils/clock/testing"
 	"knative.dev/pkg/apis"
 	duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
-	rtesting "knative.dev/pkg/reconciler/testing"
 )
 
 var now = time.Date(2022, time.January, 1, 0, 0, 0, 0, time.UTC)
@@ -622,8 +620,8 @@ func TestSendCloudEventWithRetries(t *testing.T) {
 			if err := eventstest.CheckEventsUnordered(t, ceClient.Events, tc.name, tc.wantCEvents); err != nil {
 				t.Fatalf(err.Error())
 			}
-			recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
-			if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
+			recorder := controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder)
+			if err := recorder.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
 				t.Fatalf(err.Error())
 			}
 		})
@@ -681,7 +679,7 @@ func TestSendCloudEventWithRetriesNoClient(t *testing.T) {
 
 func setupFakeContext(t *testing.T, behaviour FakeClientBehaviour, withClient bool) context.Context {
 	var ctx context.Context
-	ctx, _ = rtesting.SetupFakeContext(t)
+	ctx, _ = eventstest.SetupFakeContext(t)
 	if withClient {
 		ctx = WithClient(ctx, &behaviour)
 	}

pkg/reconciler/events/event_test.go

@@ -28,11 +28,9 @@ import (
 	eventstest "github.com/tektoncd/pipeline/test/events"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/record"
 	"knative.dev/pkg/apis"
 	duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
 	"knative.dev/pkg/controller"
-	rtesting "knative.dev/pkg/reconciler/testing"
 )
 
 func TestSendKubernetesEvents(t *testing.T) {
@@ -140,11 +138,11 @@ func TestSendKubernetesEvents(t *testing.T) {
 	}}
 
 	for _, ts := range testcases {
-		fr := record.NewFakeRecorder(1)
+		fr := eventstest.NewFakeRecorder(1)
 		tr := &corev1.Pod{}
 		sendKubernetesEvents(fr, ts.before, ts.after, tr)
 
-		err := eventstest.CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
+		err := fr.CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
 		if err != nil {
 			t.Errorf(err.Error())
 		}
@@ -167,11 +165,11 @@ func TestEmitError(t *testing.T) {
 	}}
 
 	for _, ts := range testcases {
-		fr := record.NewFakeRecorder(1)
+		fr := eventstest.NewFakeRecorder(1)
 		tr := &corev1.Pod{}
 		EmitError(fr, ts.err, tr)
 
-		err := eventstest.CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
+		err := fr.CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
 		if err != nil {
 			t.Errorf(err.Error())
 		}
@@ -221,7 +219,7 @@ func TestEmit(t *testing.T) {
 
 	for _, tc := range testcases {
 		// Setup the context and seed test data
-		ctx, _ := rtesting.SetupFakeContext(t)
+		ctx, _ := eventstest.SetupFakeContext(t)
 		ctx = cloudevent.WithClient(ctx, &cloudevent.FakeClientBehaviour{SendSuccessfully: true})
 		fakeClient := cloudevent.Get(ctx).(cloudevent.FakeClient)
 
@@ -234,9 +232,9 @@ func TestEmit(t *testing.T) {
 		}
 		ctx = config.ToContext(ctx, cfg)
 
-		recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
+		recorder := controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder)
 		Emit(ctx, nil, after, object)
-		if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
+		if err := recorder.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
 			t.Fatalf(err.Error())
 		}
 		if err := eventstest.CheckEventsUnordered(t, fakeClient.Events, tc.name, tc.wantCloudEvents); err != nil {
@@ -277,7 +275,7 @@ func TestEmitCloudEvents(t *testing.T) {
 
 	for _, tc := range testcases {
 		// Setup the context and seed test data
-		ctx, _ := rtesting.SetupFakeContext(t)
+		ctx, _ := eventstest.SetupFakeContext(t)
 		ctx = cloudevent.WithClient(ctx, &cloudevent.FakeClientBehaviour{SendSuccessfully: true})
 		fakeClient := cloudevent.Get(ctx).(cloudevent.FakeClient)
 
@@ -290,9 +288,9 @@ func TestEmitCloudEvents(t *testing.T) {
 		}
 		ctx = config.ToContext(ctx, cfg)
 
-		recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
+		recorder := controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder)
 		EmitCloudEvents(ctx, object)
-		if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
+		if err := recorder.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
 			t.Fatalf(err.Error())
 		}
 		if err := eventstest.CheckEventsUnordered(t, fakeClient.Events, tc.name, tc.wantCloudEvents); err != nil {

pkg/reconciler/pipelinerun/pipelinerun_test.go

@@ -56,7 +56,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	ktesting "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/record"
 	clock "k8s.io/utils/clock/testing"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
@@ -152,7 +151,7 @@ func initializePipelineRunControllerAssets(t *testing.T, d test.Data, opts pipel
 		Clients:    c,
 		Controller: ctl,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }
@@ -2951,7 +2950,7 @@ spec:
 				"Normal PipelineRunCouldntCancel PipelineRun \"test-pipeline-fails-to-cancel\" was cancelled but had errors trying to cancel TaskRuns",
 				"Warning InternalError 1 error occurred",
 			}
-			err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
+			err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
 			if err != nil {
 				t.Errorf(err.Error())
 			}
@@ -3067,7 +3066,7 @@ spec:
 		"Normal PipelineRunCouldntTimeOut PipelineRun \"test-pipeline-fails-to-timeout\" was timed out but had errors trying to time out TaskRuns and/or Runs",
 		"Warning InternalError 1 error occurred",
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -7082,7 +7081,7 @@ func (prt PipelineRunTest) reconcileRun(namespace, pipelineRunName string, wantE
 
 	// Check generated events match what's expected
 	if len(wantEvents) > 0 {
-		if err := eventstest.CheckEventsOrdered(prt.Test, prt.TestAssets.Recorder.Events, pipelineRunName, wantEvents); err != nil {
+		if err := prt.TestAssets.Recorder.CheckEventsOrdered(prt.Test, prt.TestAssets.Recorder.Events, pipelineRunName, wantEvents); err != nil {
 			prt.Test.Errorf(err.Error())
 		}
 	}

pkg/reconciler/resolutionrequest/resolutionrequest_test.go

@@ -29,11 +29,11 @@ import (
 	resolutioncommon "github.com/tektoncd/pipeline/pkg/resolution/common"
 	"github.com/tektoncd/pipeline/test"
 	"github.com/tektoncd/pipeline/test/diff"
+	eventstest "github.com/tektoncd/pipeline/test/events"
 	"github.com/tektoncd/pipeline/test/names"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	clock "k8s.io/utils/clock/testing"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
@@ -79,7 +79,7 @@ func initializeResolutionRequestControllerAssets(t *testing.T, d test.Data) (tes
 		Controller: ctl,
 		Clients:    c,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }

pkg/reconciler/run/run_test.go

@@ -37,7 +37,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	"knative.dev/pkg/apis"
 	cminformer "knative.dev/pkg/configmap/informer"
 	pkgreconciler "knative.dev/pkg/reconciler"
@@ -67,7 +66,7 @@ func initializeRunControllerAssets(t *testing.T, d test.Data) (test.Assets, func
 		Controller: ctl,
 		Clients:    c,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }

pkg/reconciler/taskrun/taskrun_test.go

@@ -60,7 +60,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 	ktesting "k8s.io/client-go/testing"
-	"k8s.io/client-go/tools/record"
 	clock "k8s.io/utils/clock/testing"
 	"knative.dev/pkg/apis"
 	cminformer "knative.dev/pkg/configmap/informer"
@@ -496,7 +495,7 @@ func initializeTaskRunControllerAssets(t *testing.T, d test.Data, opts pipeline.
 		Controller: ctl,
 		Clients:    c,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }
@@ -697,7 +696,8 @@ spec:
 		"Normal Start",
 		"Normal Running",
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "reconcile-cloud-events", wantEvents)
+
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, "reconcile-cloud-events", wantEvents)
 	if !(err == nil) {
 		t.Errorf(err.Error())
 	}
@@ -1192,7 +1192,7 @@ spec:
 				t.Fatalf("Expected actions to be logged in the kubeclient, got none")
 			}
 
-			err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
+			err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
 			if err != nil {
 				t.Errorf(err.Error())
 			}
@@ -1347,7 +1347,7 @@ spec:
 				t.Fatalf("Expected actions to be logged in the kubeclient, got none")
 			}
 
-			err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
+			err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
 			if err != nil {
 				t.Errorf(err.Error())
 			}
@@ -1686,7 +1686,7 @@ spec:
 				t.Errorf("expected 2 actions, got %d. Actions: %#v", len(actions), actions)
 			}
 
-			err := eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
+			err := testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
 			if !(err == nil) {
 				t.Errorf(err.Error())
 			}
@@ -1964,7 +1964,7 @@ status:
 		"Normal Running Not all Steps",
 		"Normal Succeeded",
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-pod-updateStatus", wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-pod-updateStatus", wantEvents)
 	if !(err == nil) {
 		t.Errorf(err.Error())
 	}
@@ -2063,7 +2063,7 @@ status:
 		"Normal Started",
 		"Warning Failed TaskRun \"test-taskrun-run-cancelled\" was cancelled",
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-cancelled-taskrun", wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-cancelled-taskrun", wantEvents)
 	if !(err == nil) {
 		t.Errorf(err.Error())
 	}
@@ -2136,7 +2136,7 @@ status:
 		"Normal Started",
 		"Warning Failed TaskRun \"test-taskrun-run-timedout\" was cancelled. TaskRun cancelled as pipeline has been cancelled.",
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-timedout-taskrun", wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-timedout-taskrun", wantEvents)
 	if !(err == nil) {
 		t.Errorf(err.Error())
 	}
@@ -2207,7 +2207,7 @@ status:
 	if d := cmp.Diff(expectedStatus, condition, ignoreLastTransitionTime); d != "" {
 		t.Fatalf("Did not get expected condition %s", diff.PrintWantGot(d))
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -2279,7 +2279,7 @@ status:
 	if d := cmp.Diff(expectedStatus, condition, ignoreLastTransitionTime); d != "" {
 		t.Fatalf("Did not get expected condition %s", diff.PrintWantGot(d))
 	}
-	err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
+	err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -2394,7 +2394,7 @@ status:
 			if d := cmp.Diff(tc.expectedStatus, condition, ignoreLastTransitionTime); d != "" {
 				t.Fatalf("Did not get expected condition %s", diff.PrintWantGot(d))
 			}
-			err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.taskRun.Name, tc.wantEvents)
+			err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.taskRun.Name, tc.wantEvents)
 			if !(err == nil) {
 				t.Errorf(err.Error())
 			}
@@ -3541,7 +3541,7 @@ spec:
 				}
 			}
 
-			err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tt.desc, tt.wantEvents)
+			err = testAssets.Recorder.CheckEventsOrdered(t, testAssets.Recorder.Events, tt.desc, tt.wantEvents)
 			if !(err == nil) {
 				t.Errorf(err.Error())
 			}

pkg/reconciler/testing/logger.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	eventstest "github.com/tektoncd/pipeline/test/events"
 	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/record"
 	filteredinformerfactory "knative.dev/pkg/client/injection/kube/informers/factory/filtered"
 	"knative.dev/pkg/injection"
 	logtesting "knative.dev/pkg/logging/testing"
@@ -52,7 +52,7 @@ func TestLogger(t *testing.T) *zap.SugaredLogger {
 // The provided context includes the FilteredInformerFactory LabelKey.
 func setupFakeContextWithLabelKey(t zaptest.TestingT) (context.Context, context.CancelFunc, []controller.Informer) {
 	ctx, c := context.WithCancel(logtesting.TestContextWithLogger(t))
-	ctx = controller.WithEventRecorder(ctx, record.NewFakeRecorder(1000))
+	ctx = controller.WithEventRecorder(ctx, eventstest.NewFakeRecorder(1000))
 	ctx = filteredinformerfactory.WithSelectors(ctx, v1beta1.ManagedByLabelKey)
 	ctx, is := injection.Fake.SetupInformers(ctx, &rest.Config{})
 	return ctx, c, is

pkg/resolution/resolver/framework/reconciler_test.go

@@ -32,10 +32,10 @@ import (
 	resolutioncommon "github.com/tektoncd/pipeline/pkg/resolution/common"
 	"github.com/tektoncd/pipeline/test"
 	"github.com/tektoncd/pipeline/test/diff"
+	eventstest "github.com/tektoncd/pipeline/test/events"
 	"github.com/tektoncd/pipeline/test/names"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	clock "k8s.io/utils/clock/testing"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
@@ -267,7 +267,7 @@ func getResolverFrameworkController(ctx context.Context, t *testing.T, d test.Da
 		Controller: ctl,
 		Clients:    c,
 		Informers:  informers,
-		Recorder:   controller.GetEventRecorder(ctx).(*record.FakeRecorder),
+		Recorder:   controller.GetEventRecorder(ctx).(*eventstest.FakeRecorder),
 		Ctx:        ctx,
 	}, cancel
 }