Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assert EventTypes references for IMC test #7899

Merged
merged 4 commits into from
May 10, 2024
Merged

Assert EventTypes references for IMC test #7899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7156977
Assert EventTypes references for IMC and ContainerSource test
mgencur May 7, 2024
0cc6fa9
Do not use ID as the attribute to match the event
mgencur May 7, 2024
c98041b
Fix type
mgencur May 7, 2024
2da0d09
Remove test for ContainerSource EventType creation
mgencur May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions test/experimental/eventtype_autocreate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,3 @@ func TestPingSourceEventTypeMatch(t *testing.T) {

env.Test(ctx, t, eventtype_autocreate.AutoCreateEventTypeEventsFromPingSource())
}

func TestContainerSourceEventTypeAutoCreate(t *testing.T) {
t.Parallel()

ctx, env := global.Environment(
knative.WithKnativeNamespace(system.Namespace()),
knative.WithLoggingConfig,
knative.WithTracingConfig,
k8s.WithEventListener,
environment.Managed(t),
)

env.Test(ctx, t, eventtype_autocreate.AutoCreateEventTypesOnContainerSource())
}
33 changes: 2 additions & 31 deletions test/experimental/features/eventtype_autocreate/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1"
"knative.dev/eventing/test/rekt/resources/broker"
"knative.dev/eventing/test/rekt/resources/channel_impl"
"knative.dev/eventing/test/rekt/resources/containersource"
"knative.dev/eventing/test/rekt/resources/eventtype"
"knative.dev/eventing/test/rekt/resources/pingsource"
"knative.dev/eventing/test/rekt/resources/subscription"
Expand Down Expand Up @@ -68,7 +67,8 @@ func AutoCreateEventTypesOnIMC() *feature.Feature {
Must("deliver events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasId(event.ID())).AtLeast(1)).
Must("create event type", eventtype.WaitForEventType(
eventtype.AssertReady(expectedTypes),
eventtype.AssertPresent(expectedTypes)))
eventtype.AssertPresent(expectedTypes),
eventtype.AssertReferencePresent(channel_impl.AsRef(channelName))))

return f
}
Expand Down Expand Up @@ -222,32 +222,3 @@ func AutoCreateEventTypeEventsFromPingSource() *feature.Feature {

return f
}

func AutoCreateEventTypesOnContainerSource() *feature.Feature {
f := feature.NewFeature()

event := cetest.FullEvent()
event.SetType("test.containersource.custom.event.type")

sourceName := feature.MakeRandomK8sName("containersource")
sink := feature.MakeRandomK8sName("sink")

f.Setup("install sink", eventshub.Install(sink, eventshub.StartReceiver))

destination := &duckv1.Destination{
Ref: service.AsKReference(sink),
}
f.Setup("install containersource", containersource.Install(sourceName, containersource.WithSink(destination)))

f.Setup("containersource is ready", containersource.IsReady(sourceName))

expectedTypes := sets.New(event.Type())

f.Stable("containersource").
Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasId(event.ID())).AtLeast(1)).
Must("create event type", eventtype.WaitForEventType(
eventtype.AssertReady(expectedTypes),
eventtype.AssertExactPresent(expectedTypes)))

return f
}
Loading