Skip to content

Commit d22e45e

Browse files
perdasilvaPer Goncalves da Silvam1kola
committed
🌱 patch flakes (#3281)
* patch flakes Signed-off-by: Per Goncalves da Silva <[email protected]> * Update test/e2e/subscription_e2e_test.go Co-authored-by: Mikalai Radchuk <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Mikalai Radchuk <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 161b89ca70027d720347ee9ce7729df4018584ba
1 parent d019644 commit d22e45e

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4030,7 +4030,7 @@ func TestUpdates(t *testing.T) {
40304030
csvsToSync = syncCSVs(csvsToSync, deletedCSVs(e.shouldBe))
40314031
current = csvsToSync[e.whenIn.name]
40324032
fmt.Printf("waiting for (when) %s to be %s\n", e.whenIn.name, e.whenIn.phase)
4033-
time.Sleep(1 * time.Millisecond)
4033+
time.Sleep(1 * time.Second)
40344034
}
40354035

40364036
// sync the other csvs until they're in the expected status

staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,14 +2597,20 @@ var _ = Describe("Subscription", func() {
25972597
err = magicCatalog.UpdateCatalog(context.Background(), provider)
25982598
Expect(err).To(BeNil())
25992599

2600-
By("waiting for the subscription to have v0.3.0 installed with a Package deprecated condition")
2601-
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName, subscriptionHasCondition(
2602-
operatorsv1alpha1.SubscriptionPackageDeprecated,
2603-
corev1.ConditionTrue,
2604-
"",
2605-
"olm.package/test-package: test-package has been deprecated. Please switch to another-package."))
2600+
By("waiting for the subscription to have v0.3.0 installed")
2601+
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName, subscriptionHasCurrentCSV("example-operator.v0.3.0"))
26062602
Expect(err).Should(BeNil())
26072603

2604+
By("waiting for the subscription to have v0.3.0 installed with a Package deprecated condition")
2605+
sub, err = fetchSubscription(crc, generatedNamespace.GetName(), subName,
2606+
subscriptionHasCondition(
2607+
operatorsv1alpha1.SubscriptionPackageDeprecated,
2608+
corev1.ConditionTrue,
2609+
"",
2610+
"olm.package/test-package: test-package has been deprecated. Please switch to another-package.",
2611+
),
2612+
)
2613+
26082614
By("checking for the deprecated conditions")
26092615
By(`Operator is deprecated at only Package and Channel levels`)
26102616
packageCondition := sub.Status.GetCondition(operatorsv1alpha1.SubscriptionPackageDeprecated)

0 commit comments

Comments
 (0)