@@ -78,29 +78,24 @@ var _ = BeforeSuite(func() {
78
78
var _ = AfterSuite (func () {
79
79
ctx := context .Background ()
80
80
81
- err := c .Delete (ctx , operatorCatalog )
82
- Expect (err ).ToNot (HaveOccurred ())
81
+ Expect (c .Delete (ctx , operatorCatalog )).To (Succeed ())
83
82
Eventually (func (g Gomega ) {
84
- err = c .Get (ctx , types.NamespacedName {Name : operatorCatalog .Name }, & catalogd.Catalog {})
83
+ err : = c .Get (ctx , types.NamespacedName {Name : operatorCatalog .Name }, & catalogd.Catalog {})
85
84
Expect (errors .IsNotFound (err )).To (BeTrue ())
86
85
}).Should (Succeed ())
87
86
88
87
// speed up delete without waiting for gc
89
- err = c .DeleteAllOf (ctx , & catalogd.BundleMetadata {})
90
- Expect (err ).ToNot (HaveOccurred ())
91
- err = c .DeleteAllOf (ctx , & catalogd.Package {})
92
- Expect (err ).ToNot (HaveOccurred ())
88
+ Expect (c .DeleteAllOf (ctx , & catalogd.BundleMetadata {})).To (Succeed ())
89
+ Expect (c .DeleteAllOf (ctx , & catalogd.Package {})).To (Succeed ())
93
90
94
91
Eventually (func (g Gomega ) {
95
92
// ensure resource cleanup
96
93
packages := & catalogd.PackageList {}
97
- err = c .List (ctx , packages )
98
- g .Expect (err ).To (BeNil ())
94
+ g .Expect (c .List (ctx , packages )).To (Succeed ())
99
95
g .Expect (packages .Items ).To (BeEmpty ())
100
96
101
97
bmd := & catalogd.BundleMetadataList {}
102
- err = c .List (ctx , bmd )
103
- g .Expect (err ).To (BeNil ())
98
+ g .Expect (c .List (ctx , bmd )).To (Succeed ())
104
99
g .Expect (bmd .Items ).To (BeEmpty ())
105
100
}).Should (Succeed ())
106
101
})
0 commit comments