Skip to content

Refactor ChannelTestRunner to ComponentTestRunner #3340

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

Merged
knative-prow-robot merged 3 commits into from
Jun 18, 2020
Merged

Refactor ChannelTestRunner to ComponentTestRunner #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ffe71d
Refactor ChannelTestRunner to ComponentTestRunner
devguyio Jun 18, 2020
9b1dc9c
Use testlib package alias everywhere
devguyio Jun 18, 2020
8fce66b
Fix formatting and goimport
devguyio Jun 18, 2020
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
4 changes: 2 additions & 2 deletions test/conformance/broker_control_plane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestBrokerV1Beta1ControlPlane(t *testing.T) {
helpers.BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(t, brokerClass, channelTestRunner, lib.SetupClientOptionNoop)
helpers.BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(t, brokerClass, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/broker_tracing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestBrokerTracing(t *testing.T) {
helpers.BrokerTracingTestHelperWithChannelTestRunner(t, brokerClass, channelTestRunner, lib.SetupClientOptionNoop)
helpers.BrokerTracingTestHelperWithChannelTestRunner(t, brokerClass, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_addressable_resolver_cluster_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelAddressableResolverClusterRoleTest(t *testing.T) {
helpers.TestChannelAddressableResolverClusterRoleTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.TestChannelAddressableResolverClusterRoleTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_channelable_manipulator_cluster_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelChannelableManipulatorClusterRoleTest(t *testing.T) {
helpers.TestChannelChannelableManipulatorClusterRoleTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.TestChannelChannelableManipulatorClusterRoleTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_crd_metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelCRDMetadata(t *testing.T) {
helpers.ChannelCRDMetadataTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelCRDMetadataTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_crd_name_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelCRDName(t *testing.T) {
helpers.ChannelCRDNameTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelCRDNameTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelSpec(t *testing.T) {
helpers.ChannelSpecTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelSpecTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_status_subscriber_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelStatusSubscriber(t *testing.T) {
helpers.ChannelStatusSubscriberTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelStatusSubscriberTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelStatus(t *testing.T) {
helpers.ChannelStatusTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelStatusTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
4 changes: 2 additions & 2 deletions test/conformance/channel_tracing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"testing"

"knative.dev/eventing/test/conformance/helpers"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelTracingWithReply(t *testing.T) {
helpers.ChannelTracingTestHelperWithChannelTestRunner(t, channelTestRunner, lib.SetupClientOptionNoop)
helpers.ChannelTracingTestHelperWithChannelTestRunner(t, channelTestRunner, testlib.SetupClientOptionNoop)
}
36 changes: 18 additions & 18 deletions test/conformance/helpers/broker_control_plane_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"

"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/duck"
"knative.dev/eventing/test/lib/resources"
)
Expand All @@ -39,12 +39,12 @@ import (
func BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(
t *testing.T,
brokerClass string,
channelTestRunner lib.ChannelTestRunner,
setupClient ...lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
setupClient ...testlib.SetupClientOption,
) {
channelTestRunner.RunTests(t, lib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
client := lib.Setup(t, true, setupClient...)
defer lib.TearDown(client)
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
client := testlib.Setup(t, true, setupClient...)
defer testlib.TearDown(client)
brokerName := "br"
triggerNoBroker := "trigger-no-broker"
triggerWithBroker := "trigger-with-broker"
Expand Down Expand Up @@ -76,20 +76,20 @@ func BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(

}

func TriggerV1Beta1BeforeBrokerHelper(t *testing.T, triggerName string, client *lib.Client) {
func TriggerV1Beta1BeforeBrokerHelper(t *testing.T, triggerName string, client *testlib.Client) {
const etLogger = "logger"
const loggerPodName = "logger-pod"

logPod := resources.EventRecordPod(loggerPodName)
client.CreatePodOrFail(logPod, lib.WithService(loggerPodName))
client.CreatePodOrFail(logPod, testlib.WithService(loggerPodName))
client.WaitForAllTestResourcesReadyOrFail() //Can't do this for the trigger because it's not 'ready' yet
client.CreateTriggerOrFailV1Beta1(triggerName,
resources.WithAttributesTriggerFilterV1Beta1(eventingv1beta1.TriggerAnyFilter, etLogger, map[string]interface{}{}),
resources.WithSubscriberServiceRefForTriggerV1Beta1(loggerPodName),
)
}

func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass string, client *lib.Client, channel metav1.TypeMeta) {
func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass string, client *testlib.Client, channel metav1.TypeMeta) {
client.CreateBrokerConfigMapOrFail(brokerName, &channel)

broker := client.CreateBrokerV1Beta1OrFail(
Expand All @@ -98,20 +98,20 @@ func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass str
resources.WithConfigMapForBrokerConfig(),
)

client.WaitForResourceReadyOrFail(broker.Name, lib.BrokerTypeMeta)
client.WaitForResourceReadyOrFail(broker.Name, testlib.BrokerTypeMeta)

}

func ReadyBrokerV1Beta1AvailableHelper(t *testing.T, brokerName string, client *lib.Client) {
client.WaitForResourceReadyOrFail(brokerName, lib.BrokerTypeMeta)
obj := resources.NewMetaResource(brokerName, client.Namespace, lib.BrokerTypeMeta)
func ReadyBrokerV1Beta1AvailableHelper(t *testing.T, brokerName string, client *testlib.Client) {
client.WaitForResourceReadyOrFail(brokerName, testlib.BrokerTypeMeta)
obj := resources.NewMetaResource(brokerName, client.Namespace, testlib.BrokerTypeMeta)
_, err := duck.GetAddressableURI(client.Dynamic, obj)
if err != nil {
t.Fatalf("Broker is not addressable %v", err)
}
}

func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName string, client *lib.Client) {
func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName string, client *testlib.Client) {
const etLogger = "logger"
const loggerPodName = "logger-pod"

Expand All @@ -121,10 +121,10 @@ func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName
resources.WithBrokerV1Beta1(brokerName),
)

client.WaitForResourceReadyOrFail(trigger.Name, lib.TriggerTypeMeta)
client.WaitForResourceReadyOrFail(trigger.Name, testlib.TriggerTypeMeta)
}

func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, brokerName string, client *lib.Client) {
func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, brokerName string, client *testlib.Client) {
tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(triggerName, metav1.GetOptions{})
if err != nil {
t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err)
Expand All @@ -145,8 +145,8 @@ func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro

}

func TriggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *lib.Client) {
client.WaitForResourceReadyOrFail(triggerName, lib.TriggerTypeMeta)
func TriggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *testlib.Client) {
client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta)
tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(triggerName, metav1.GetOptions{})
if err != nil {
t.Fatalf("Error: Could not get trigger %s: %v", tr.Name, err)
Expand Down
20 changes: 10 additions & 10 deletions test/conformance/helpers/broker_tracing_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ import (
"knative.dev/eventing/pkg/apis/eventing/v1beta1"
"knative.dev/eventing/pkg/utils"
tracinghelper "knative.dev/eventing/test/conformance/helpers/tracing"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/recordevents"
"knative.dev/eventing/test/lib/resources"
"knative.dev/eventing/test/lib/resources/sender"
)

// BrokerTracingTestHelperWithChannelTestRunner runs the Broker tracing tests for all Channels in
// the ChannelTestRunner.
// the ComponentsTestRunner.
func BrokerTracingTestHelperWithChannelTestRunner(
t *testing.T,
brokerClass string,
channelTestRunner lib.ChannelTestRunner,
setupClient lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
setupClient testlib.SetupClientOption,
) {
channelTestRunner.RunTests(t, lib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
tracingTest(t, setupClient, setupBrokerTracing(brokerClass), channel)
})
}
Expand All @@ -65,7 +65,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {
return func(
t *testing.T,
channel *metav1.TypeMeta,
client *lib.Client,
client *testlib.Client,
loggerPodName string,
senderPublishTrace bool,
) (tracinghelper.TestSpanTree, cetest.EventMatcher) {
Expand All @@ -80,7 +80,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {

// Create a logger (EventRecord) Pod and a K8s Service that points to it.
logPod := resources.EventRecordPod(loggerPodName)
client.CreatePodOrFail(logPod, lib.WithService(loggerPodName))
client.CreatePodOrFail(logPod, testlib.WithService(loggerPodName))

// Create a Trigger that receives events (type=bar) and sends them to the logger Pod.
loggerTrigger := client.CreateTriggerOrFailV1Beta1(
Expand All @@ -98,7 +98,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {
senderName,
[]byte(eventBody),
)
client.CreatePodOrFail(eventTransformerPod, lib.WithService(eventTransformerPod.Name))
client.CreatePodOrFail(eventTransformerPod, testlib.WithService(eventTransformerPod.Name))

// Create a Trigger that receives events (type=foo) and sends them to the transformer Pod.
transformerTrigger := client.CreateTriggerOrFailV1Beta1(
Expand All @@ -122,9 +122,9 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {

// Send the CloudEvent (either with or without tracing inside the SendEvents Pod).
if senderPublishTrace {
client.SendEventToAddressable(senderName, broker.Name, lib.BrokerTypeMeta, event, sender.EnableTracing())
client.SendEventToAddressable(senderName, broker.Name, testlib.BrokerTypeMeta, event, sender.EnableTracing())
} else {
client.SendEventToAddressable(senderName, broker.Name, lib.BrokerTypeMeta, event)
client.SendEventToAddressable(senderName, broker.Name, testlib.BrokerTypeMeta, event)
}

domain := utils.GetClusterDomainName()
Expand Down
8 changes: 4 additions & 4 deletions test/conformance/helpers/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package helpers

import (
"github.com/pkg/errors"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/duck"
"knative.dev/eventing/test/lib/resources"

Expand All @@ -42,7 +42,7 @@ var (
}
)

func getChannelDuckTypeSupportVersion(channelName string, client *lib.Client, channel *metav1.TypeMeta) (string, error) {
func getChannelDuckTypeSupportVersion(channelName string, client *testlib.Client, channel *metav1.TypeMeta) (string, error) {
metaResource := resources.NewMetaResource(channelName, client.Namespace, channel)
obj, err := duck.GetGenericObject(client.Dynamic, metaResource, &eventingduckv1beta1.Channelable{})
if err != nil {
Expand All @@ -55,7 +55,7 @@ func getChannelDuckTypeSupportVersion(channelName string, client *lib.Client, ch
return channelable.ObjectMeta.Annotations[SubscribableAnnotationKey], nil
}

func getChannelAsV1Beta1Channelable(channelName string, client *lib.Client, channel metav1.TypeMeta) (*eventingduckv1beta1.Channelable, error) {
func getChannelAsV1Beta1Channelable(channelName string, client *testlib.Client, channel metav1.TypeMeta) (*eventingduckv1beta1.Channelable, error) {
metaResource := resources.NewMetaResource(channelName, client.Namespace, &channel)
obj, err := duck.GetGenericObject(client.Dynamic, metaResource, &eventingduckv1beta1.Channelable{})
if err != nil {
Expand All @@ -69,7 +69,7 @@ func getChannelAsV1Beta1Channelable(channelName string, client *lib.Client, chan
return channelable, nil
}

func getChannelAsV1Alpha1Channelable(channelName string, client *lib.Client, channel metav1.TypeMeta) (*eventingduckv1alpha1.Channelable, error) {
func getChannelAsV1Alpha1Channelable(channelName string, client *testlib.Client, channel metav1.TypeMeta) (*eventingduckv1alpha1.Channelable, error) {
metaResource := resources.NewMetaResource(channelName, client.Namespace, &channel)
obj, err := duck.GetGenericObject(client.Dynamic, metaResource, &eventingduckv1alpha1.Channelable{})
if err != nil {
Expand Down
12 changes: 6 additions & 6 deletions test/conformance/helpers/channel_addressable_resolver_cluster_role_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/storage/names"

"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelAddressableResolverClusterRoleTestRunner(
t *testing.T,
channelTestRunner lib.ChannelTestRunner,
options ...lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
options ...testlib.SetupClientOption,
) {

const aggregationClusterRoleName = "addressable-resolver"
var permissionTestCaseVerbs = []string{"get", "list", "watch"}

channelTestRunner.RunTests(t, lib.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
client := lib.Setup(st, true, options...)
defer lib.TearDown(client)
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
client := testlib.Setup(st, true, options...)
defer testlib.TearDown(client)

gvr, _ := meta.UnsafeGuessKindToResource(channel.GroupVersionKind())

Expand Down
12 changes: 6 additions & 6 deletions test/conformance/helpers/channel_channelable_manipulator_cluster_role_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/storage/names"

"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
)

func TestChannelChannelableManipulatorClusterRoleTestRunner(
t *testing.T,
channelTestRunner lib.ChannelTestRunner,
options ...lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
options ...testlib.SetupClientOption,
) {

const aggregationClusterRoleName = "channelable-manipulator"
var permissionTestCaseVerbs = []string{"get", "list", "watch", "update", "patch"}

channelTestRunner.RunTests(t, lib.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
client := lib.Setup(st, true, options...)
defer lib.TearDown(client)
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
client := testlib.Setup(st, true, options...)
defer testlib.TearDown(client)

gvr, _ := meta.UnsafeGuessKindToResource(channel.GroupVersionKind())

Expand Down
Loading