Merge pull request #1077 from ozhuraki/envtest-crud-and-upgrade

envtest: Fix upgrade test fail when the tests for CRUD operations fail

Author: mythi

test/envtest/dlbdeviceplugin_controller_test.go

@@ -128,4 +128,8 @@ var _ = Describe("DlbDevicePlugin Controller", func() {
 
 		Expect(dp.Spec.Image == image).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("dlb", &devicepluginv1.DlbDevicePlugin{})
+	})
 })

test/envtest/dsadeviceplugin_controller_test.go

@@ -162,4 +162,8 @@ var _ = Describe("DsaDevicePlugin Controller", func() {
 		Expect(dp.Spec.Image == image).To(BeTrue())
 		Expect(dp.Spec.InitImage == initimage).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("dsa", &devicepluginv1.DsaDevicePlugin{})
+	})
 })

test/envtest/fpgadeviceplugin_controller_test.go

@@ -143,4 +143,8 @@ var _ = Describe("FpgaDevicePlugin Controller", func() {
 		Expect(dp.Spec.Image == image).To(BeTrue())
 		Expect(dp.Spec.InitImage == initimage).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("fpga", &devicepluginv1.FpgaDevicePlugin{})
+	})
 })

test/envtest/gpudeviceplugin_controller_test.go

@@ -147,4 +147,8 @@ var _ = Describe("GpuDevicePlugin Controller", func() {
 		Expect(dp.Spec.Image == image).To(BeTrue())
 		Expect(dp.Spec.InitImage == initimage).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("gpu", &devicepluginv1.GpuDevicePlugin{})
+	})
 })

test/envtest/iaadeviceplugin_controller_test.go

@@ -166,4 +166,8 @@ var _ = Describe("IaaDevicePlugin Controller", func() {
 
 		Expect(dp.Spec.Image == image).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("iaa", &devicepluginv1.IaaDevicePlugin{})
+	})
 })

test/envtest/qatdeviceplugin_controller_test.go

@@ -177,4 +177,8 @@ var _ = Describe("QatDevicePlugin Controller", func() {
 		Expect(dp.Spec.Image == image).To(BeTrue())
 		Expect(dp.Spec.InitImage == initimage).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("qat", &devicepluginv1.QatDevicePlugin{})
+	})
 })

test/envtest/sgxdeviceplugin_controller_test.go

@@ -149,4 +149,8 @@ var _ = Describe("SgxDevicePlugin Controller", func() {
 		Expect(dp.Spec.Image == image).To(BeTrue())
 		Expect(dp.Spec.InitImage == initimage).To(BeTrue())
 	})
+
+	var _ = AfterEach(func() {
+		CleanupAfter("sgx", &devicepluginv1.SgxDevicePlugin{})
+	})
 })

test/envtest/suite_test.go

@@ -135,6 +135,14 @@ func up() {
 	time.Sleep(time.Second)
 }
 
+func CleanupAfter(name string, cr client.Object) {
+	namespacedName := types.NamespacedName{Namespace: ns, Name: name + "deviceplugin-test"}
+
+	if err := k8sClient.Get(ctx, namespacedName, cr); err == nil {
+		Expect(k8sClient.Delete(ctx, cr)).Should(Succeed())
+	}
+}
+
 func down() {
 	time.Sleep(time.Second)