github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent b7514645d4 8725c96014
commit 0322d34a3e
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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