diff --git a/test/rekt/features/trigger/feature.go b/test/rekt/features/trigger/feature.go index 684cc7350fc..44399e77d5d 100644 --- a/test/rekt/features/trigger/feature.go +++ b/test/rekt/features/trigger/feature.go @@ -129,19 +129,7 @@ func TriggerWithTLSSubscriber() *feature.Feature { f.Requirement("Wait for Trigger to become ready", trigger.IsReady(triggerName)) - f.Setup("trigger is not ready", func(ctx context.Context, t feature.T) { - trigger, err := trigger.Get(ctx, triggerName) - if err != nil { - t.Fatalf("Failed to get Trigger: %v", err) - } - if trigger.Status.IsReady() { - t.Fatalf("Trigger is ready when it should not be") - } - reason := trigger.Status.GetCondition(apis.ConditionReady).reason - if reason != "DependencyDoesNotExist" { - t.Fatalf("expected reason to be DependencyDoesNotExist but got: %v", reason) - } - }) + f.Setup("Trigger is not ready DependencyDoesNotExist ", trigger.IsNotReady(triggerName)) f.Setup("Install failing trigger", func(ctx context.Context, t feature.T) { dls := service.AsDestinationRef(dlsName) @@ -155,20 +143,7 @@ func TriggerWithTLSSubscriber() *feature.Feature { }) f.Requirement("Wait for failing Trigger to become ready", trigger.IsReady(dlsTriggerName)) - f.Setup("Failed trigger is not ready", func(ctx context.Context, t feature.T) { - trigger, err := trigger.Get(ctx, dlsTriggerName) - if err != nil { - t.Fatalf("Failed to get Trigger: %v", err) - } - if trigger.Status.IsReady() { - t.Fatalf("Failed Trigger is ready when it should not be") - } - reason := trigger.Status.GetCondition(apis.ConditionReady).reason - if reason != "DependencyDoesNotExist" { - t.Fatalf("expected reason to be DependencyDoesNotExist but got: %v", reason) - } - }) - f.Setup("Wait for failing Trigger to become ready", trigger.IsReady(dlsTriggerName)) + f.Setup("Trigger is not ready DependencyDoesNotExist", trigger.IsNotReady(dlsTriggerName)) // Install Source f.Requirement("Install Source", eventshub.Install( @@ -230,21 +205,7 @@ func TriggerWithTLSSubscriberTrustBundle() *feature.Feature { trigger.WithSubscriberFromDestination(subscriber))(ctx, t) }) - f.Requirement("Wait for failing Trigger to become ready", trigger.IsReady(triggerName)) - - f.Setup("Failed trigger is not ready", func(ctx context.Context, t feature.T) { - trigger, err := trigger.Get(ctx, triggerName) - if err != nil { - t.Fatalf("Failed to get Trigger: %v", err) - } - if trigger.Status.IsReady() { - t.Fatalf("Failed Trigger is ready when it should not be") - } - reason := trigger.Status.GetCondition(apis.ConditionReady).reason - if reason != "DependencyDoesNotExist" { - t.Fatalf("expected reason to be DependencyDoesNotExist but got: %v", reason) - } - }) + f.Requirement("Wait for Trigger to become ready", trigger.IsReady(triggerName)) f.Setup("Install failing trigger", func(ctx context.Context, t feature.T) { dls := &duckv1.Destination{ @@ -261,7 +222,9 @@ func TriggerWithTLSSubscriberTrustBundle() *feature.Feature { trigger.WithDeadLetterSinkFromDestination(dls), trigger.WithSubscriber(nil, "http://127.0.0.1:2468"))(ctx, t) }) - f.Setup("Wait for failing Trigger to become ready", trigger.IsReady(dlsTriggerName)) + f.Requirement("Wait for failing Trigger to become ready", trigger.IsReady(dlsTriggerName)) + + f.Setup("Trigger is not ready DependencyDoesNotExist", trigger.IsNotReady(triggerName)) // Install Source f.Requirement("Install Source", eventshub.Install( diff --git a/test/rekt/resources/trigger/trigger.go b/test/rekt/resources/trigger/trigger.go index e6ea82a71fe..e5214a24f10 100644 --- a/test/rekt/resources/trigger/trigger.go +++ b/test/rekt/resources/trigger/trigger.go @@ -192,6 +192,11 @@ func IsReady(name string, timing ...time.Duration) feature.StepFn { return k8s.IsReady(GVR(), name, timing...) } +// IsNotReady tests to see if a Trigger becomes NotReady within the time given. +func IsNotReady(name string, timing ...time.Duration) feature.StepFn { + return k8s.IsNotReady(GVR(), name, timing...) +} + func WithNewFilters(filters []eventingv1.SubscriptionsAPIFilter) manifest.CfgFn { jsonBytes, err := json.Marshal(filters) if err != nil {