Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yongxuanzhang
Yongxuanzhang committed Nov 30, 2022
1 parent a32e597 commit f1721ff
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 101 deletions.
6 changes: 3 additions & 3 deletions pkg/reconciler/events/cloudevent/cloud_event_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
"github.com/tektoncd/pipeline/pkg/reconciler/events/k8sevent"
"github.com/tektoncd/pipeline/test/diff"
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"
Expand Down Expand Up @@ -622,7 +622,7 @@ func TestSendCloudEventWithRetries(t *testing.T) {
ceClient := Get(ctx).(FakeClient)
ceClient.CheckCloudEventsUnordered(t, tc.name, tc.wantCEvents)
recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
if err := k8sevent.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
t.Fatalf(err.Error())
}
})
Expand Down Expand Up @@ -725,7 +725,7 @@ func TestEmitCloudEvents(t *testing.T) {

recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
EmitCloudEvents(ctx, object)
if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
if err := k8sevent.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
t.Fatalf(err.Error())
}
fakeClient.CheckCloudEventsUnordered(t, tc.name, tc.wantCloudEvents)
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/events/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/tektoncd/pipeline/pkg/apis/config"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
"github.com/tektoncd/pipeline/pkg/reconciler/events/cloudevent"
eventstest "github.com/tektoncd/pipeline/test/events"
"github.com/tektoncd/pipeline/pkg/reconciler/events/k8sevent"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/record"
Expand Down Expand Up @@ -90,7 +90,7 @@ func TestEmit(t *testing.T) {

recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
Emit(ctx, nil, after, object)
if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
if err := k8sevent.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
t.Fatalf(err.Error())
}
fakeClient.CheckCloudEventsUnordered(t, tc.name, tc.wantCloudEvents)
Expand Down
7 changes: 3 additions & 4 deletions pkg/reconciler/events/k8sevent/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (

"github.com/tektoncd/pipeline/pkg/apis/config"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
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"
Expand Down Expand Up @@ -142,7 +141,7 @@ func TestEmitK8sEventsOnConditions(t *testing.T) {
ctx, _ := rtesting.SetupFakeContext(t)
recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
EmitK8sEvents(ctx, ts.before, ts.after, tr)
err := eventstest.CheckEventsOrdered(t, recorder.Events, ts.name, ts.wantEvents)
err := CheckEventsOrdered(t, recorder.Events, ts.name, ts.wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -201,7 +200,7 @@ func TestEmitK8sEvents(t *testing.T) {

recorder := controller.GetEventRecorder(ctx).(*record.FakeRecorder)
EmitK8sEvents(ctx, nil, after, object)
if err := eventstest.CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
if err := CheckEventsOrdered(t, recorder.Events, tc.name, tc.wantEvents); err != nil {
t.Fatalf(err.Error())
}
}
Expand All @@ -226,7 +225,7 @@ func TestEmitError(t *testing.T) {
fr := record.NewFakeRecorder(1)
tr := &corev1.Pod{}
EmitError(fr, ts.err, tr)
err := eventstest.CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
err := CheckEventsOrdered(t, fr.Events, ts.name, ts.wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/reconciler/pipelinerun/pipelinerun_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ import (
resourcev1alpha1 "github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1"
resolutionutil "github.com/tektoncd/pipeline/pkg/internal/resolution"
"github.com/tektoncd/pipeline/pkg/reconciler/events/cloudevent"
"github.com/tektoncd/pipeline/pkg/reconciler/events/k8sevent"
"github.com/tektoncd/pipeline/pkg/reconciler/pipelinerun/resources"
ttesting "github.com/tektoncd/pipeline/pkg/reconciler/testing"
"github.com/tektoncd/pipeline/pkg/reconciler/volumeclaim"
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"
"github.com/tektoncd/pipeline/test/parse"
"gomodules.xyz/jsonpatch/v2"
Expand Down Expand Up @@ -2951,7 +2951,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -3067,7 +3067,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, prName, wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -7082,7 +7082,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 := k8sevent.CheckEventsOrdered(prt.Test, prt.TestAssets.Recorder.Events, pipelineRunName, wantEvents); err != nil {
prt.Test.Errorf(err.Error())
}
}
Expand Down
24 changes: 12 additions & 12 deletions pkg/reconciler/taskrun/taskrun_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ import (
resolutionutil "github.com/tektoncd/pipeline/pkg/internal/resolution"
podconvert "github.com/tektoncd/pipeline/pkg/pod"
"github.com/tektoncd/pipeline/pkg/reconciler/events/cloudevent"
"github.com/tektoncd/pipeline/pkg/reconciler/events/k8sevent"
"github.com/tektoncd/pipeline/pkg/reconciler/taskrun/resources"
ttesting "github.com/tektoncd/pipeline/pkg/reconciler/testing"
"github.com/tektoncd/pipeline/pkg/reconciler/volumeclaim"
resolutioncommon "github.com/tektoncd/pipeline/pkg/resolution/common"
"github.com/tektoncd/pipeline/pkg/workspace"
"github.com/tektoncd/pipeline/test"
"github.com/tektoncd/pipeline/test/diff"
eventstest "github.com/tektoncd/pipeline/test/events"
"github.com/tektoncd/pipeline/test/names"
"github.com/tektoncd/pipeline/test/parse"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -701,7 +701,7 @@ spec:
t.Errorf("Expected reason %q but was %s", v1beta1.TaskRunReasonRunning.String(), condition.Reason)
}

err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "reconcile-cloud-events", wantEvents)
err = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, "reconcile-cloud-events", wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -1193,7 +1193,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -1348,7 +1348,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -1687,7 +1687,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 := k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.name, tc.wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -1965,7 +1965,7 @@ status:
"Normal Running Not all Steps",
"Normal Succeeded",
}
err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-pod-updateStatus", wantEvents)
err = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-pod-updateStatus", wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -2064,7 +2064,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-cancelled-taskrun", wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -2137,7 +2137,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, "test-reconcile-on-timedout-taskrun", wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -2208,7 +2208,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -2280,7 +2280,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, taskRun.Name, wantEvents)
if err != nil {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -2395,7 +2395,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 = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, tc.taskRun.Name, tc.wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down Expand Up @@ -3543,7 +3543,7 @@ spec:
}
}

err = eventstest.CheckEventsOrdered(t, testAssets.Recorder.Events, tt.desc, tt.wantEvents)
err = k8sevent.CheckEventsOrdered(t, testAssets.Recorder.Events, tt.desc, tt.wantEvents)
if !(err == nil) {
t.Errorf(err.Error())
}
Expand Down
76 changes: 0 additions & 76 deletions test/events/events.go
View file

This file was deleted.

0 comments on commit f1721ff

Please sign in to comment.