From b125bdda20d84418bc282576bbeadbed44a03827 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Wed, 7 Aug 2019 18:28:45 -0700 Subject: [PATCH] Don't overwrite PVC with nil/empty object returned by failed Update --- test/e2e/storage/csi_mock_volume.go | 6 ++++-- test/e2e/storage/flexvolume_mounted_volume_resize.go | 3 ++- test/e2e/storage/flexvolume_online_resize.go | 3 ++- test/e2e/storage/mounted_volume_resize.go | 3 ++- test/e2e/storage/testsuites/volume_expand.go | 8 +++++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/test/e2e/storage/csi_mock_volume.go b/test/e2e/storage/csi_mock_volume.go index 595b8ee5215..39383ef3f2c 100644 --- a/test/e2e/storage/csi_mock_volume.go +++ b/test/e2e/storage/csi_mock_volume.go @@ -470,8 +470,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() { ginkgo.By("Expanding current pvc") newSize := resource.MustParse("6Gi") - pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs) + newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs) framework.ExpectNoError(err, "While updating pvc for more size") + pvc = newPVC gomega.Expect(pvc).NotTo(gomega.BeNil()) pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] @@ -561,8 +562,9 @@ var _ = utils.SIGDescribe("CSI mock volume", func() { ginkgo.By("Expanding current pvc") newSize := resource.MustParse("6Gi") - pvc, err = testsuites.ExpandPVCSize(pvc, newSize, m.cs) + newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, m.cs) framework.ExpectNoError(err, "While updating pvc for more size") + pvc = newPVC gomega.Expect(pvc).NotTo(gomega.BeNil()) pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] diff --git a/test/e2e/storage/flexvolume_mounted_volume_resize.go b/test/e2e/storage/flexvolume_mounted_volume_resize.go index 0a21de8d3bd..8696a4b501a 100644 --- a/test/e2e/storage/flexvolume_mounted_volume_resize.go +++ b/test/e2e/storage/flexvolume_mounted_volume_resize.go @@ -159,8 +159,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() { ginkgo.By("Expanding current pvc") newSize := resource.MustParse("6Gi") - pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c) + newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c) framework.ExpectNoError(err, "While updating pvc for more size") + pvc = newPVC gomega.Expect(pvc).NotTo(gomega.BeNil()) pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] diff --git a/test/e2e/storage/flexvolume_online_resize.go b/test/e2e/storage/flexvolume_online_resize.go index 863f5cf8e97..18762f07aa7 100644 --- a/test/e2e/storage/flexvolume_online_resize.go +++ b/test/e2e/storage/flexvolume_online_resize.go @@ -157,8 +157,9 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa ginkgo.By("Expanding current pvc") newSize := resource.MustParse("6Gi") - pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c) + newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c) framework.ExpectNoError(err, "While updating pvc for more size") + pvc = newPVC gomega.Expect(pvc).NotTo(gomega.BeNil()) pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] diff --git a/test/e2e/storage/mounted_volume_resize.go b/test/e2e/storage/mounted_volume_resize.go index 24d76eee8ed..06066070bc6 100644 --- a/test/e2e/storage/mounted_volume_resize.go +++ b/test/e2e/storage/mounted_volume_resize.go @@ -131,8 +131,9 @@ var _ = utils.SIGDescribe("Mounted volume expand", func() { ginkgo.By("Expanding current pvc") newSize := resource.MustParse("6Gi") - pvc, err = testsuites.ExpandPVCSize(pvc, newSize, c) + newPVC, err := testsuites.ExpandPVCSize(pvc, newSize, c) framework.ExpectNoError(err, "While updating pvc for more size") + pvc = newPVC gomega.Expect(pvc).NotTo(gomega.BeNil()) pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] diff --git a/test/e2e/storage/testsuites/volume_expand.go b/test/e2e/storage/testsuites/volume_expand.go index 08b5d0dcc94..a68bfed028e 100644 --- a/test/e2e/storage/testsuites/volume_expand.go +++ b/test/e2e/storage/testsuites/volume_expand.go @@ -143,7 +143,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte newSize := currentPvcSize.DeepCopy() newSize.Add(resource.MustParse("1Gi")) e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) - l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) + _, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) framework.ExpectError(err, "While updating non-expandable PVC") }) } else { @@ -170,8 +170,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte newSize := currentPvcSize.DeepCopy() newSize.Add(resource.MustParse("1Gi")) e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) - l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) + newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) framework.ExpectNoError(err, "While updating pvc for more size") + l.resource.pvc = newPVC gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil()) pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage] @@ -231,8 +232,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte newSize := currentPvcSize.DeepCopy() newSize.Add(resource.MustParse("1Gi")) e2elog.Logf("currentPvcSize %v, newSize %v", currentPvcSize, newSize) - l.resource.pvc, err = ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) + newPVC, err := ExpandPVCSize(l.resource.pvc, newSize, f.ClientSet) framework.ExpectNoError(err, "While updating pvc for more size") + l.resource.pvc = newPVC gomega.Expect(l.resource.pvc).NotTo(gomega.BeNil()) pvcSize := l.resource.pvc.Spec.Resources.Requests[v1.ResourceStorage]