mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #100937 from mengjiao-liu/fix-metrics-nil-pointer
Fix csi_client_test.go metrics nil pointer dereference
This commit is contained in:
commit
0322d34a3e
@ -750,13 +750,18 @@ func TestVolumeHealthEnable(t *testing.T) {
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
if tc.volumeConditionSet {
|
||||
assert.NotNil(t, metrics.Abnormal)
|
||||
assert.NotNil(t, metrics.Message)
|
||||
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.Message)
|
||||
if tc.volumeConditionSet {
|
||||
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, metrics.Abnormal)
|
||||
assert.Nil(t, metrics.Message)
|
||||
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.Message)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user