From 77b49c6f82f30e2fd9ab3d5df7a50cbe48fccde4 Mon Sep 17 00:00:00 2001 From: Ben Moss Date: Fri, 11 Jun 2021 13:49:38 -0400 Subject: [PATCH 1/3] Fix more tests depending on non-existent services --- test/rekt/features/broker/readyness.go | 4 +--- test/rekt/features/channel/features.go | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/rekt/features/broker/readyness.go b/test/rekt/features/broker/readyness.go index 402dbe9cedd..9e5cb3a780e 100644 --- a/test/rekt/features/broker/readyness.go +++ b/test/rekt/features/broker/readyness.go @@ -37,9 +37,7 @@ func TriggerGoesReady(name, brokerName string) *feature.Feature { // The test needs a subscriber. sub := feature.MakeRandomK8sName("sub") f.Setup("install a service", svc.Install(sub, "app", "rekt")) - - // Point the Trigger subscriber to the service installed in setup. - cfg = append(cfg, trigger.WithSubscriber(svc.AsKReference(name), "")) + cfg = append(cfg, trigger.WithSubscriber(svc.AsKReference(sub), "")) // Install the trigger f.Setup(fmt.Sprintf("install trigger %q", name), trigger.Install(name, brokerName, cfg...)) diff --git a/test/rekt/features/channel/features.go b/test/rekt/features/channel/features.go index 14f10d2aad4..2a56e45ed0f 100644 --- a/test/rekt/features/channel/features.go +++ b/test/rekt/features/channel/features.go @@ -79,15 +79,17 @@ func ChannelChain(length int) *feature.Feature { func DeadLetterSink() *feature.Feature { f := feature.NewFeature() sink := feature.MakeRandomK8sName("sink") + failer := feature.MakeK8sNamePrefix("failer") cs := feature.MakeRandomK8sName("containersource") name := feature.MakeRandomK8sName("channel") f.Setup("install sink", eventshub.Install(sink, eventshub.StartReceiver)) + f.Setup("install failing receiver", eventshub.Install(failer, eventshub.StartReceiver, eventshub.DropFirstN(1))) f.Setup("install channel", channel_impl.Install(name, delivery.WithDeadLetterSink(svc.AsKReference(sink), ""))) f.Setup("install containersource", containersource.Install(cs, source.WithSink(channel_impl.AsRef(name), ""))) f.Setup("install subscription", subscription.Install(feature.MakeRandomK8sName("subscription"), subscription.WithChannel(channel_impl.AsRef(name)), - subscription.WithReply(svc.AsKReference("does-not-exist"), ""), + subscription.WithReply(svc.AsKReference(failer), ""), )) f.Requirement("channel is ready", channel_impl.IsReady(name)) From bb1a3949ebc2859738331246f36af81a98957cf3 Mon Sep 17 00:00:00 2001 From: Ben Moss Date: Fri, 11 Jun 2021 14:50:02 -0400 Subject: [PATCH 2/3] Fix channel_status_subscriber_test Not really sure why it was appending "-pod" here but the channel-req-status-subscriber-svc didn't exist. --- .../helpers/channel_status_subscriber_test_helper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conformance/helpers/channel_status_subscriber_test_helper.go b/test/conformance/helpers/channel_status_subscriber_test_helper.go index bfc6b21145a..684ad5d00f6 100644 --- a/test/conformance/helpers/channel_status_subscriber_test_helper.go +++ b/test/conformance/helpers/channel_status_subscriber_test_helper.go @@ -59,7 +59,7 @@ func channelHasRequiredSubscriberStatus(ctx context.Context, st *testing.T, clie client.CreateChannelOrFail(channelName, &channel) client.WaitForResourceReadyOrFail(channelName, &channel) - _ = recordevents.DeployEventRecordOrFail(context.TODO(), client, subscriberServiceName+"-pod") + _ = recordevents.DeployEventRecordOrFail(context.TODO(), client, subscriberServiceName) subscription := client.CreateSubscriptionOrFail( subscriberServiceName, From dade82484cb7d2ad0748ca23fdae06dd38b7070d Mon Sep 17 00:00:00 2001 From: Ben Moss Date: Mon, 14 Jun 2021 11:56:53 -0400 Subject: [PATCH 3/3] Update licenses --- .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/LICENSE | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/README.md | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/cleanhttp.go | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/doc.go | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/go.mod | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/handlers.go | 0 .../github.com/hashicorp/go-retryablehttp/.gitignore | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/LICENSE | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/Makefile | 0 .../github.com/hashicorp/go-retryablehttp/README.md | 0 .../github.com/hashicorp/go-retryablehttp/client.go | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.mod | 0 .../VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.sum | 0 .../github.com/hashicorp/go-retryablehttp/roundtripper.go | 0 .../VENDOR-LICENSE/github.com/hashicorp/golang-lru/.gitignore | 0 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/2q.go | 0 .../VENDOR-LICENSE/github.com/hashicorp/golang-lru/LICENSE | 0 .../VENDOR-LICENSE/github.com/hashicorp/golang-lru/README.md | 0 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/arc.go | 0 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/doc.go | 0 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/go.mod | 0 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/lru.go | 0 .../github.com/hashicorp/golang-lru/simplelru/lru.go | 0 .../github.com/hashicorp/golang-lru/simplelru/lru_interface.go | 0 24 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/LICENSE mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/README.md mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/cleanhttp.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/doc.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/go.mod mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/handlers.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/.gitignore mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/LICENSE mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/Makefile mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/README.md mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/client.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.mod mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.sum mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/roundtripper.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/.gitignore mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/2q.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/LICENSE mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/README.md mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/arc.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/doc.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/go.mod mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/lru.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru.go mode change 100644 => 100755 third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru_interface.go diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/LICENSE b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/LICENSE old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/README.md b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/README.md old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/cleanhttp.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/cleanhttp.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/doc.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/doc.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/go.mod b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/go.mod old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/handlers.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-cleanhttp/handlers.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/.gitignore b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/.gitignore old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/LICENSE b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/LICENSE old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/Makefile b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/Makefile old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/README.md b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/README.md old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/client.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/client.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.mod b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.mod old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.sum b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/go.sum old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/roundtripper.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/go-retryablehttp/roundtripper.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/.gitignore b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/.gitignore old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/2q.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/2q.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/LICENSE b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/LICENSE old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/README.md b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/README.md old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/arc.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/arc.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/doc.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/doc.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/go.mod b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/go.mod old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/lru.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/lru.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru.go old mode 100644 new mode 100755 diff --git a/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru_interface.go b/third_party/VENDOR-LICENSE/github.com/hashicorp/golang-lru/simplelru/lru_interface.go old mode 100644 new mode 100755