From 2061924b0fdc8d3f5303d99f34e9648accbf0abd Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Wed, 8 Apr 2020 17:09:13 -0400 Subject: [PATCH 1/3] [volume] VolumeMode nil pointer check --- pkg/volume/cinder/cinder_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/cinder/cinder_block_test.go b/pkg/volume/cinder/cinder_block_test.go index cc01d27b69a..636e1454081 100644 --- a/pkg/volume/cinder/cinder_block_test.go +++ b/pkg/volume/cinder/cinder_block_test.go @@ -70,7 +70,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { } block := v1.PersistentVolumeBlock specMode := spec.PersistentVolume.Spec.VolumeMode - if &specMode == nil { + if specMode == nil { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", &specMode, block) } if *specMode != block { From 05149450d9af0cc3f67dbd18ca987a8bf4cf07de Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Fri, 10 Apr 2020 09:23:35 -0400 Subject: [PATCH 2/3] s/t.Errorf/t.Fatalf/ --- pkg/volume/cinder/cinder_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/cinder/cinder_block_test.go b/pkg/volume/cinder/cinder_block_test.go index 636e1454081..90b041f78f7 100644 --- a/pkg/volume/cinder/cinder_block_test.go +++ b/pkg/volume/cinder/cinder_block_test.go @@ -71,7 +71,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { block := v1.PersistentVolumeBlock specMode := spec.PersistentVolume.Spec.VolumeMode if specMode == nil { - t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", &specMode, block) + t.Fatalf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", &specMode, block) } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block) From 11d54320ac1679e986a5c8cc8ec397b1d7fbb52b Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sat, 11 Apr 2020 10:02:56 -0400 Subject: [PATCH 3/3] Correct error message --- pkg/volume/cinder/cinder_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/cinder/cinder_block_test.go b/pkg/volume/cinder/cinder_block_test.go index 90b041f78f7..c4edfc3c0ef 100644 --- a/pkg/volume/cinder/cinder_block_test.go +++ b/pkg/volume/cinder/cinder_block_test.go @@ -71,7 +71,7 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) { block := v1.PersistentVolumeBlock specMode := spec.PersistentVolume.Spec.VolumeMode if specMode == nil { - t.Fatalf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", &specMode, block) + t.Fatalf("Failed to get volumeMode from PersistentVolumeBlock") } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block)