Skip to content

K
k3s
Commit fbeb07ae authored by Cheng Xing's avatar Cheng Xing
Browse files
Options

Fixed nil dereference in dynamic provisioning e2e tests

parent d83c8bc1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
test/e2e/storage/volume_provisioning.go
View file @ fbeb07ae
...@@ -109,12 +109,16 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla ...@@ -109,12 +109,16 @@ func testDynamicProvisioning(t storageClassTest, client clientset.Interface, cla
// Check PV properties // Check PV properties
By("checking the PV") By("checking the PV")
Expect(pv.Spec.PersistentVolumeReclaimPolicy).To(Equal(*class.ReclaimPolicy))
expectedAccessModes := []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce} expectedAccessModes := []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}
Expect(pv.Spec.AccessModes).To(Equal(expectedAccessModes)) Expect(pv.Spec.AccessModes).To(Equal(expectedAccessModes))
Expect(pv.Spec.ClaimRef.Name).To(Equal(claim.ObjectMeta.Name)) Expect(pv.Spec.ClaimRef.Name).To(Equal(claim.ObjectMeta.Name))
Expect(pv.Spec.ClaimRef.Namespace).To(Equal(claim.ObjectMeta.Namespace)) 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 // Run the checker
if t.pvCheck != nil { if t.pvCheck != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment