github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100937 from mengjiao-liu/fix-metrics-nil-pointer

Browse Source 
Fix csi_client_test.go metrics nil pointer dereference
This commit is contained in:
Kubernetes Prow Robot 2021-06-08 07:27:14 -07:00 committed by GitHub
commit 0322d34a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/volume/csi/csi_client_test.go
View File

@ -750,13 +750,18 @@ func TestVolumeHealthEnable(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
} }
if tc.volumeConditionSet { if metrics == nil {
assert.NotNil(t, metrics.Abnormal) t.Errorf("csi.NodeGetVolumeStats returned nil metrics for volume %s", tc.volumeData.VolumeID)
assert.NotNil(t, metrics.Message)
} else { } else {
assert.Nil(t, metrics.Abnormal) if tc.volumeConditionSet {
assert.Nil(t, metrics.Message) assert.NotNil(t, metrics.Abnormal)
assert.NotNil(t, metrics.Message)
} else {
assert.Nil(t, metrics.Abnormal)
assert.Nil(t, metrics.Message)
}
} }
}) })
} }
} }
@ -792,8 +797,12 @@ func TestVolumeHealthDisable(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
} }
assert.Nil(t, metrics.Abnormal) if metrics == nil {
assert.Nil(t, metrics.Message) t.Errorf("csi.NodeGetVolumeStats returned nil metrics for volume %s", tc.volumeData.VolumeID)
} else {
assert.Nil(t, metrics.Abnormal)
assert.Nil(t, metrics.Message)
}
}) })
} }
} }