Merge pull request #52819 from verult/provisioner-e2e-fix

Automatic merge from submit-queue (batch tested with PRs 48406, 52819). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Fixed nil dereference in dynamic provisioning e2e tests **What this PR does / why we need it**: Fixed nil dereference in dynamic provisioning e2e tests. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #52815 **Release note**: ```release-note-none NONE ``` /sig storage /assign @saad-ali /cc @wongma7 /release-note-none

Merge pull request #52819 from verult/provisioner-e2e-fix
939ae0a9 · Kubernetes Submit Queue · GitHub · 1a8bf2d8 · fbeb07ae · 939ae0a9
Commit 939ae0a9 authored Sep 20, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

volume_provisioning.go test/e2e/storage/volume_provisioning.go +6 -2

No files found.
--- 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 {