From 8725c960149625442cd5cbfc1b9189a836d1d6b8 Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Fri, 9 Apr 2021 10:15:56 +0800 Subject: [PATCH] Fix csi_client_test.go metrics nil pointer dereference --- pkg/volume/csi/csi_client_test.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkg/volume/csi/csi_client_test.go b/pkg/volume/csi/csi_client_test.go index 0729d5b2afb..53238bedacf 100644 --- a/pkg/volume/csi/csi_client_test.go +++ b/pkg/volume/csi/csi_client_test.go @@ -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) + } }) } }