Skip to content

Commit 9c2b51a

Browse files
committed
Address Tim's feedback
1 parent e539f26 commit 9c2b51a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

test/e2e/installplan_e2e_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,10 +3281,6 @@ var _ = Describe("Install Plan", func() {
32813281

32823282
catsrcName = catsrc.GetName()
32833283

3284-
// Wait for the CatalogSource to be ready
3285-
_, err := fetchCatalogSourceOnStatus(newCRClient(), catsrc.GetName(), catsrc.GetNamespace(), catalogSourceRegistryPodSynced)
3286-
Expect(err).ToNot(HaveOccurred())
3287-
32883284
// Create the OperatorGroup
32893285
og := &operatorsv1.OperatorGroup{
32903286
ObjectMeta: metav1.ObjectMeta{

test/e2e/subscription_e2e_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,8 @@ var _ = Describe("Subscription", func() {
847847
Expect(err).ToNot(HaveOccurred())
848848
}()
849849

850-
// Wait for the CatalogSource to be ready
851-
_, err = fetchCatalogSourceOnStatus(crc, cs.GetName(), cs.GetNamespace(), catalogSourceRegistryPodSynced)
850+
// Wait for the CatalogSource status to be updated to reflect its invalid spec
851+
_, err = fetchCatalogSourceOnStatus(crc, cs.GetName(), cs.GetNamespace(), catalogSourceInvalidSpec)
852852
Expect(err).ToNot(HaveOccurred(), "catalog source did not become ready")
853853

854854
subName := genName("sub-")

test/e2e/util_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ func catalogSourceRegistryPodSynced(catalog *v1alpha1.CatalogSource) bool {
325325
return false
326326
}
327327

328+
func catalogSourceInvalidSpec(catalog *v1alpha1.CatalogSource) bool {
329+
return catalog.Status.Reason == v1alpha1.CatalogSourceSpecInvalidError
330+
}
331+
328332
func fetchCatalogSourceOnStatus(crc versioned.Interface, name, namespace string, check catalogSourceCheckFunc) (*v1alpha1.CatalogSource, error) {
329333
var fetched *v1alpha1.CatalogSource
330334
var err error

0 commit comments

Comments
 (0)