From fbeb07aeacf6e053067caaf48769104d382a288d Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Wed, 20 Sep 2017 16:08:09 -0700 Subject: [PATCH] Fixed nil dereference in dynamic provisioning e2e tests --- test/e2e/storage/volume_provisioning.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index 3c431aed5bd..465c4fa4015 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -109,12 +109,16 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla // Check PV properties By("checking the PV") - Expect(pv.Spec.PersistentVolumeReclaimPolicy).To(Equal(*class.ReclaimPolicy)) expectedAccessModes := []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce} Expect(pv.Spec.AccessModes).To(Equal(expectedAccessModes)) Expect(pv.Spec.ClaimRef.Name).To(Equal(claim.ObjectMeta.Name)) Expect(pv.Spec.ClaimRef.Namespace).To(Equal(claim.ObjectMeta.Namespace)) - Expect(pv.Spec.MountOptions).To(Equal(class.MountOptions)) + if class == nil { + Expect(pv.Spec.PersistentVolumeReclaimPolicy).To(Equal(v1.PersistentVolumeReclaimDelete)) + } else { + Expect(pv.Spec.PersistentVolumeReclaimPolicy).To(Equal(*class.ReclaimPolicy)) + Expect(pv.Spec.MountOptions).To(Equal(class.MountOptions)) + } // Run the checker if t.pvCheck != nil {