From a2e3a9f37ab911ae028961767cc83aadfe4375d8 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sat, 11 Apr 2020 09:59:15 -0400 Subject: [PATCH 1/4] gce_correct_nil_check --- pkg/volume/gcepd/gce_pd_block_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/volume/gcepd/gce_pd_block_test.go b/pkg/volume/gcepd/gce_pd_block_test.go index 73271732998..1b9ee16f9cc 100644 --- a/pkg/volume/gcepd/gce_pd_block_test.go +++ b/pkg/volume/gcepd/gce_pd_block_test.go @@ -70,8 +70,8 @@ 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) + if specMode == nil { + t.Fatalf("Empty volumeMode from GlobalMapPath spec") } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block) From e84c41541789f206113913af642b87fef30ef303 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sat, 11 Apr 2020 10:05:29 -0400 Subject: [PATCH 2/4] Correct error log message --- pkg/volume/gcepd/gce_pd_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/gcepd/gce_pd_block_test.go b/pkg/volume/gcepd/gce_pd_block_test.go index 1b9ee16f9cc..afc70988111 100644 --- a/pkg/volume/gcepd/gce_pd_block_test.go +++ b/pkg/volume/gcepd/gce_pd_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("Empty volumeMode from GlobalMapPath spec") + t.Fatalf("Failed to get volumeMode from PersistentVolumeBlock") } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block) From 749839c050aa8e153aaec673d4a7377d83d0e3d5 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Fri, 24 Apr 2020 10:48:09 -0400 Subject: [PATCH 3/4] Change the error message --- pkg/volume/gcepd/gce_pd_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/gcepd/gce_pd_block_test.go b/pkg/volume/gcepd/gce_pd_block_test.go index afc70988111..0abb186ed1a 100644 --- a/pkg/volume/gcepd/gce_pd_block_test.go +++ b/pkg/volume/gcepd/gce_pd_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("Failed to get volumeMode from PersistentVolumeBlock") + t.Errorf("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 3531283b70a8bfa0d8a15f9296c9355f92538982 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Fri, 24 Apr 2020 11:15:48 -0400 Subject: [PATCH 4/4] Changed error message --- pkg/volume/gcepd/gce_pd_block_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/volume/gcepd/gce_pd_block_test.go b/pkg/volume/gcepd/gce_pd_block_test.go index 0abb186ed1a..f03bd32f064 100644 --- a/pkg/volume/gcepd/gce_pd_block_test.go +++ b/pkg/volume/gcepd/gce_pd_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("Failed to get volumeMode from PersistentVolumeBlock: %v", block) } if *specMode != block { t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block)