From 15411f1dac6be9881d693deea9f0b6b30c639039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= Date: Thu, 27 May 2021 16:25:07 +0200 Subject: [PATCH 1/2] Don't wait on triggers, before deploying their subscriber --- test/upgrade/prober/sut/broker.go | 9 --------- test/upgrade/prober/sut/broker_e2e_test.go | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/test/upgrade/prober/sut/broker.go b/test/upgrade/prober/sut/broker.go index a468a3b4afc..7f433cf1d0f 100644 --- a/test/upgrade/prober/sut/broker.go +++ b/test/upgrade/prober/sut/broker.go @@ -129,13 +129,4 @@ func (b *BrokerAndTriggers) deployTriggers(ctx Context, dest duckv1.Destination) ) triggers = append(triggers, trgr) } - for _, trgr := range triggers { - meta := resources.NewMetaResource( - trgr.Name, trgr.Namespace, testlib.TriggerTypeMeta, - ) - err := duck.WaitForResourceReady(ctx.Client.Dynamic, meta) - if err != nil { - ctx.T.Fatal(err) - } - } } diff --git a/test/upgrade/prober/sut/broker_e2e_test.go b/test/upgrade/prober/sut/broker_e2e_test.go index 71c13602815..8e2153da349 100644 --- a/test/upgrade/prober/sut/broker_e2e_test.go +++ b/test/upgrade/prober/sut/broker_e2e_test.go @@ -71,6 +71,8 @@ func TestBrokerAndTriggers(t *testing.T) { defer tr.Teardown(sutCtx) } assert.NotEmpty(t, endpoint) + + client.WaitForAllTestResourcesReadyOrFail(ctx) step1 := watholasender.NewCloudEvent(watholaevent.Step{Number: 1}, watholaevent.StepType) step2 := watholasender.NewCloudEvent(watholaevent.Step{Number: 2}, From 315cad991e39eee6c4f0c6b2fa0ee578ad665c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= Date: Thu, 27 May 2021 16:51:51 +0200 Subject: [PATCH 2/2] Fix golangci-lint issue --- test/upgrade/prober/sut/broker.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/upgrade/prober/sut/broker.go b/test/upgrade/prober/sut/broker.go index 7f433cf1d0f..719df618535 100644 --- a/test/upgrade/prober/sut/broker.go +++ b/test/upgrade/prober/sut/broker.go @@ -109,7 +109,6 @@ func (b *BrokerAndTriggers) fetchURL(ctx Context) *apis.URL { } func (b *BrokerAndTriggers) deployTriggers(ctx Context, dest duckv1.Destination) { - triggers := make([]*eventingv1.Trigger, 0, len(b.Triggers.Types)) for _, eventType := range b.Triggers.Types { name := fmt.Sprintf("%s-%s", b.Name, eventType) subscriberOption := resources.WithSubscriberDestination(func(t *eventingv1.Trigger) duckv1.Destination { @@ -117,7 +116,7 @@ func (b *BrokerAndTriggers) deployTriggers(ctx Context, dest duckv1.Destination) }) ctx.Log.Debugf("Creating trigger \"%s\" for type %s to route to %#v", name, eventType, dest) - trgr := ctx.Client.CreateTriggerOrFail( + _ = ctx.Client.CreateTriggerOrFail( name, resources.WithBroker(b.Name), resources.WithAttributesTriggerFilter( @@ -127,6 +126,5 @@ func (b *BrokerAndTriggers) deployTriggers(ctx Context, dest duckv1.Destination) ), subscriberOption, ) - triggers = append(triggers, trgr) } }