From cfb85300830793df2f823d587afd04db4d3baa3f Mon Sep 17 00:00:00 2001 From: "Muyassarov, Feruzjon" Date: Mon, 8 May 2023 13:44:38 +0300 Subject: [PATCH] e2e: delete CRs only if found Delete NodeFeatureRule and NodeFeature CRs only if found. Signed-off-by: Muyassarov, Feruzjon --- test/e2e/node_feature_discovery_test.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/e2e/node_feature_discovery_test.go b/test/e2e/node_feature_discovery_test.go index 485bdf26b..0723e0ed6 100644 --- a/test/e2e/node_feature_discovery_test.go +++ b/test/e2e/node_feature_discovery_test.go @@ -150,19 +150,23 @@ func cleanupCRs(ctx context.Context, cli *nfdclient.Clientset, namespace string) nfrs, err := cli.NfdV1alpha1().NodeFeatureRules().List(ctx, metav1.ListOptions{}) Expect(err).NotTo(HaveOccurred()) - By("Deleting NodeFeatureRule objects from the cluster") - for _, nfr := range nfrs.Items { - err = cli.NfdV1alpha1().NodeFeatureRules().Delete(ctx, nfr.Name, metav1.DeleteOptions{}) - Expect(err).NotTo(HaveOccurred()) + if len(nfrs.Items) != 0 { + By("Deleting NodeFeatureRule objects from the cluster") + for _, nfr := range nfrs.Items { + err = cli.NfdV1alpha1().NodeFeatureRules().Delete(ctx, nfr.Name, metav1.DeleteOptions{}) + Expect(err).NotTo(HaveOccurred()) + } } nfs, err := cli.NfdV1alpha1().NodeFeatures(namespace).List(ctx, metav1.ListOptions{}) Expect(err).NotTo(HaveOccurred()) - By("Deleting NodeFeature objects from namespace " + namespace) - for _, nf := range nfs.Items { - err = cli.NfdV1alpha1().NodeFeatures(namespace).Delete(ctx, nf.Name, metav1.DeleteOptions{}) - Expect(err).NotTo(HaveOccurred()) + if len(nfs.Items) != 0 { + By("Deleting NodeFeature objects from namespace " + namespace) + for _, nf := range nfs.Items { + err = cli.NfdV1alpha1().NodeFeatures(namespace).Delete(ctx, nf.Name, metav1.DeleteOptions{}) + Expect(err).NotTo(HaveOccurred()) + } } }