Skip to content

Commit

Permalink
Avoid assuming no delivery spec configured for broker.
Browse files Browse the repository at this point in the history
This commit adds a delivery spec to `t2` to avoid assuming
that the Broker delivery spec is empty by default.

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
  • Loading branch information
pierDipi committed Jan 10, 2022
1 parent c855f12 commit d5d5997
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 0 additions & 2 deletions test/rekt/broker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
"knative.dev/reconciler-test/pkg/k8s"
"knative.dev/reconciler-test/pkg/knative"

"knative.dev/reconciler-test/pkg/eventshub"

"knative.dev/eventing/pkg/apis/eventing"
"knative.dev/eventing/test/rekt/features/broker"
b "knative.dev/eventing/test/rekt/resources/broker"
Expand Down
20 changes: 12 additions & 8 deletions test/rekt/features/broker/control_plane.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/injection/clients/dynamicclient"
"knative.dev/pkg/ptr"
"knative.dev/reconciler-test/pkg/environment"
"knative.dev/reconciler-test/pkg/feature"
"knative.dev/reconciler-test/pkg/state"
"knative.dev/reconciler-test/resources/svc"

v1 "knative.dev/eventing/pkg/apis/duck/v1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
eventingclientsetv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1"
Expand All @@ -39,14 +48,6 @@ import (
brokerresources "knative.dev/eventing/test/rekt/resources/broker"
"knative.dev/eventing/test/rekt/resources/delivery"
triggerresources "knative.dev/eventing/test/rekt/resources/trigger"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"knative.dev/pkg/injection/clients/dynamicclient"
"knative.dev/pkg/ptr"
"knative.dev/reconciler-test/pkg/environment"
"knative.dev/reconciler-test/pkg/feature"
"knative.dev/reconciler-test/pkg/state"
"knative.dev/reconciler-test/resources/svc"
)

func ControlPlaneConformance(brokerName string) *feature.FeatureSet {
Expand Down Expand Up @@ -318,6 +319,9 @@ func addControlPlaneDelivery(fs *feature.FeatureSet) {
DeadLetterSink: new(duckv1.Destination),
Retry: ptr.Int32(3),
},
t2DS: &v1.DeliverySpec{
Retry: ptr.Int32(0),
},
t1FailCount: 3, // Should get event.
t2FailCount: 1, // Should be dropped.
}, {
Expand Down

0 comments on commit d5d5997

Please sign in to comment.