From 8714cb2120ffd12f11480c9c2ecd4524448c11de Mon Sep 17 00:00:00 2001 From: kubevirt-bot Date: Tue, 21 Nov 2023 16:35:40 +0100 Subject: [PATCH] reconcile_test: Extend DataSource / DataImportCron restore test Extend the test that ensures DataSources are not restored when a DataImportCron is present into a table with a PVC and a Snapshot entry. Signed-off-by: kubevirt-bot --- .../operands/data-sources/reconcile_test.go | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/internal/operands/data-sources/reconcile_test.go b/internal/operands/data-sources/reconcile_test.go index d7a7b55fb..2ab10efc2 100644 --- a/internal/operands/data-sources/reconcile_test.go +++ b/internal/operands/data-sources/reconcile_test.go @@ -221,7 +221,7 @@ var _ = Describe("Data-Sources operand", func() { Expect(ds.Spec).To(Equal(testDataSources[0].Spec)) }) - It("should not restore DataSource if DataImportCron prefers snapshots sources", func() { + DescribeTable("should not restore DataSource if DataImportCron is present", func(source cdiv1beta1.DataSourceSource) { _, err := operand.Reconcile(&request) Expect(err).ToNot(HaveOccurred()) @@ -232,11 +232,7 @@ var _ = Describe("Data-Sources operand", func() { // Update DataSource to simulate CDI ds := &cdiv1beta1.DataSource{} Expect(request.Client.Get(request.Context, client.ObjectKeyFromObject(&testDataSources[0]), ds)).To(Succeed()) - ds.Spec.Source.PVC = nil - ds.Spec.Source.Snapshot = &cdiv1beta1.DataVolumeSourceSnapshot{ - Namespace: "test", - Name: "test", - } + ds.Spec.Source = source Expect(request.Client.Update(request.Context, ds)).To(Succeed()) _, err = operand.Reconcile(&request) @@ -244,13 +240,23 @@ var _ = Describe("Data-Sources operand", func() { // Test that DataSource was not changed Expect(request.Client.Get(request.Context, client.ObjectKeyFromObject(&testDataSources[0]), ds)).To(Succeed()) - Expect(ds.Spec.Source).To(Equal(cdiv1beta1.DataSourceSource{ + Expect(ds.Spec.Source).To(Equal(source)) + }, + Entry("and prefers PVCs", cdiv1beta1.DataSourceSource{ + PVC: &cdiv1beta1.DataVolumeSourcePVC{ + Namespace: "test", + Name: "test", + }, + Snapshot: nil, + }), + Entry("and prefers Snapshots", cdiv1beta1.DataSourceSource{ + PVC: nil, Snapshot: &cdiv1beta1.DataVolumeSourceSnapshot{ Namespace: "test", Name: "test", }, - })) - }) + }), + ) }) Context("with existing PVC", func() {