From b4452f078759b316882a01cd83ad71a2847b8807 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 20 Oct 2020 15:25:09 +0530 Subject: [PATCH] e2e: validate the error return instead of object for consitency If loadPVC() fails, it return error and we expect the PVC object to be nil too. In many places we check on the error and exit. However in few places we are looking at PVC object. This commit make the condition check on `err` instead of `PVC` object for consistency. Signed-off-by: Humble Chirammal --- e2e/cephfs.go | 2 +- e2e/resize.go | 4 ++-- e2e/upgrade-cephfs.go | 2 +- e2e/upgrade-rbd.go | 2 +- e2e/utils.go | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 9c558e23c..4de74acde 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -335,7 +335,7 @@ var _ = Describe("cephfs", func() { By("create PVC, delete backing subvolume and check pv deletion", func() { pvc, err := loadPVC(pvcPath) - if pvc == nil { + if err != nil { e2elog.Failf("failed to load PVC with error %v", err) } pvc.Namespace = f.UniqueName diff --git a/e2e/resize.go b/e2e/resize.go index a1040d52a..8ad6cb173 100644 --- a/e2e/resize.go +++ b/e2e/resize.go @@ -65,13 +65,13 @@ func resizePVCAndValidateSize(pvcPath, appPath string, f *framework.Framework) e size := "1Gi" expandSize := "10Gi" pvc, err := loadPVC(pvcPath) - if pvc == nil { + if err != nil { return err } pvc.Namespace = f.UniqueName resizePvc, err := loadPVC(pvcPath) - if resizePvc == nil { + if err != nil { return err } resizePvc.Namespace = f.UniqueName diff --git a/e2e/upgrade-cephfs.go b/e2e/upgrade-cephfs.go index c9bc40477..e524f1c47 100644 --- a/e2e/upgrade-cephfs.go +++ b/e2e/upgrade-cephfs.go @@ -142,7 +142,7 @@ var _ = Describe("CephFS Upgrade Testing", func() { label := make(map[string]string) pvc, err = loadPVC(pvcPath) - if pvc == nil { + if err != nil { e2elog.Failf("failed to load pvc with error %v", err) } pvc.Namespace = f.UniqueName diff --git a/e2e/upgrade-rbd.go b/e2e/upgrade-rbd.go index 6e32c7e1d..8540c9135 100644 --- a/e2e/upgrade-rbd.go +++ b/e2e/upgrade-rbd.go @@ -160,7 +160,7 @@ var _ = Describe("RBD Upgrade Testing", func() { data := "check data persists" pvc, err = loadPVC(pvcPath) - if pvc == nil { + if err != nil { e2elog.Failf("failed to load pvc with error %v", err) } pvc.Namespace = f.UniqueName diff --git a/e2e/utils.go b/e2e/utils.go index 22409730e..bdd453e22 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -188,7 +188,7 @@ func deletePVCAndApp(name string, f *framework.Framework, pvc *v1.PersistentVolu func createPVCAndAppBinding(pvcPath, appPath string, f *framework.Framework, pvcTimeout int) (*v1.PersistentVolumeClaim, *v1.Pod, error) { pvc, err := loadPVC(pvcPath) - if pvc == nil { + if err != nil { return nil, nil, err } pvc.Namespace = f.UniqueName @@ -356,7 +356,7 @@ func writeDataInPod(app *v1.Pod, f *framework.Framework) error { func checkDataPersist(pvcPath, appPath string, f *framework.Framework) error { data := "checking data persist" pvc, err := loadPVC(pvcPath) - if pvc == nil { + if err != nil { return err } @@ -450,7 +450,7 @@ func pvcDeleteWhenPoolNotFound(pvcPath string, cephfs bool, f *framework.Framewo func checkMountOptions(pvcPath, appPath string, f *framework.Framework, mountFlags []string) error { pvc, err := loadPVC(pvcPath) - if pvc == nil { + if err != nil { return err }