@@ -251,21 +251,30 @@ func testCleanup(t *testing.T, cat *catalogd.ClusterCatalog, clusterExtension *o
251251 return errors .IsNotFound (err )
252252 }, pollDuration , pollInterval )
253253
254- t .Logf ("By deleting ClusterExtension %q" , clusterExtension .Name )
255- require .NoError (t , c .Delete (context .Background (), clusterExtension ))
256- require .Eventually (t , func () bool {
257- err := c .Get (context .Background (), types.NamespacedName {Name : clusterExtension .Name }, & ocv1.ClusterExtension {})
258- return errors .IsNotFound (err )
259- }, pollDuration , pollInterval )
254+ //t.Logf("By deleting ClusterExtension %q", clusterExtension.Name)
255+ if clusterExtension != nil {
256+ t .Logf ("By deleting ClusterExtension %q" , clusterExtension .Name )
257+ require .NoError (t , c .Delete (context .Background (), clusterExtension ))
258+ require .Eventually (t , func () bool {
259+ err := c .Get (context .Background (), types.NamespacedName {Name : clusterExtension .Name }, & ocv1.ClusterExtension {})
260+ return errors .IsNotFound (err )
261+ }, pollDuration , pollInterval )
262+ } else {
263+ t .Log (" ClusterExtension is nil" , clusterExtension )
264+ }
260265
261- t .Logf ("By deleting ServiceAccount %q" , sa .Name )
262- require .NoError (t , c .Delete (context .Background (), sa ))
263- require .Eventually (t , func () bool {
264- err := c .Get (context .Background (), types.NamespacedName {Name : sa .Name , Namespace : sa .Namespace }, & corev1.ServiceAccount {})
265- return errors .IsNotFound (err )
266- }, pollDuration , pollInterval )
266+ if sa != nil {
267+ t .Logf ("By deleting ServiceAccount %q" , sa .Name )
268+ require .NoError (t , c .Delete (context .Background (), sa ))
269+ require .Eventually (t , func () bool {
270+ err := c .Get (context .Background (), types.NamespacedName {Name : sa .Name , Namespace : sa .Namespace }, & corev1.ServiceAccount {})
271+ return errors .IsNotFound (err )
272+ }, pollDuration , pollInterval )
273+ }
267274
268- ensureNoExtensionResources (t , clusterExtension .Name )
275+ if clusterExtension != nil {
276+ ensureNoExtensionResources (t , clusterExtension .Name )
277+ }
269278
270279 t .Logf ("By deleting Namespace %q" , ns .Name )
271280 require .NoError (t , c .Delete (context .Background (), ns ))
0 commit comments