Skip to content

Commit

Permalink
missed some
Browse files Browse the repository at this point in the history
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
  • Loading branch information
everettraven committed Jun 8, 2023
1 parent 8249968 commit 7f4c1bf
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,29 +78,24 @@ var _ = BeforeSuite(func() {
var _ = AfterSuite(func() {
ctx := context.Background()

err := c.Delete(ctx, operatorCatalog)
Expect(err).ToNot(HaveOccurred())
Expect(c.Delete(ctx, operatorCatalog)).To(Succeed())
Eventually(func(g Gomega) {
err = c.Get(ctx, types.NamespacedName{Name: operatorCatalog.Name}, &catalogd.Catalog{})
err := c.Get(ctx, types.NamespacedName{Name: operatorCatalog.Name}, &catalogd.Catalog{})
Expect(errors.IsNotFound(err)).To(BeTrue())
}).Should(Succeed())

// speed up delete without waiting for gc
err = c.DeleteAllOf(ctx, &catalogd.BundleMetadata{})
Expect(err).ToNot(HaveOccurred())
err = c.DeleteAllOf(ctx, &catalogd.Package{})
Expect(err).ToNot(HaveOccurred())
Expect(c.DeleteAllOf(ctx, &catalogd.BundleMetadata{})).To(Succeed())
Expect(c.DeleteAllOf(ctx, &catalogd.Package{})).To(Succeed())

Eventually(func(g Gomega) {
// ensure resource cleanup
packages := &catalogd.PackageList{}
err = c.List(ctx, packages)
g.Expect(err).To(BeNil())
g.Expect(c.List(ctx, packages)).To(Succeed())
g.Expect(packages.Items).To(BeEmpty())

bmd := &catalogd.BundleMetadataList{}
err = c.List(ctx, bmd)
g.Expect(err).To(BeNil())
g.Expect(c.List(ctx, bmd)).To(Succeed())
g.Expect(bmd.Items).To(BeEmpty())
}).Should(Succeed())
})
Expand Down

0 comments on commit 7f4c1bf

Please sign in to comment.