Skip to content

Commit 1404e91

Browse files
perdasilvaPer Goncalves da Silva
and
Per Goncalves da Silva
authored
patch subscription e2e flake (#3302)
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent a5230c7 commit 1404e91

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

test/e2e/subscription_e2e_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2605,7 +2605,7 @@ var _ = Describe("Subscription", func() {
26052605
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName, subscriptionStateAtLatestChecker())
26062606
Expect(err).Should(BeNil())
26072607

2608-
By("waiting for the subscription to have v0.3.0 installed without a bundle deprecated condition")
2608+
By("waiting for the install plan pending to go away")
26092609
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName,
26102610
subscriptionHasCondition(
26112611
operatorsv1alpha1.SubscriptionInstallPlanPending,
@@ -2616,14 +2616,23 @@ var _ = Describe("Subscription", func() {
26162616
)
26172617
Expect(err).Should(BeNil())
26182618

2619+
By("waiting for the subscription to have v0.3.0 installed without a bundle deprecated condition")
2620+
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName,
2621+
subscriptionHasCondition(
2622+
operatorsv1alpha1.SubscriptionBundleDeprecated,
2623+
corev1.ConditionUnknown,
2624+
"",
2625+
"",
2626+
),
2627+
)
2628+
Expect(err).Should(BeNil())
2629+
26192630
By("checking for the deprecated conditions")
26202631
By(`Operator is deprecated at only Package and Channel levels`)
26212632
packageCondition := sub.Status.GetCondition(operatorsv1alpha1.SubscriptionPackageDeprecated)
26222633
Expect(packageCondition.Status).To(Equal(corev1.ConditionTrue))
26232634
channelCondition := sub.Status.GetCondition(operatorsv1alpha1.SubscriptionChannelDeprecated)
26242635
Expect(channelCondition.Status).To(Equal(corev1.ConditionTrue))
2625-
bundleCondition = sub.Status.GetCondition(operatorsv1alpha1.SubscriptionBundleDeprecated)
2626-
Expect(bundleCondition.Status).To(Equal(corev1.ConditionUnknown))
26272636

26282637
By("verifying that a roll-up condition is present not containing bundle deprecation condition")
26292638
By(`Roll-up condition should be present and contain deprecation messages from Package and Channel levels`)

0 commit comments

Comments
 (0)