Merge pull request kubernetes#90080 from gaurav1086/gce_nil_ptr_check

k8s-ci-robot · web-flow · commit 36eee3ca8aaa · 2020-04-25T12:17:29.000-07:00
[GCE] VolumeNode nil check
diff --git 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("Failed to get volumeMode from PersistentVolumeBlock: %v", block)
 	}
 	if *specMode != block {
 		t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block)

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ func TestGetVolumeSpecFromGlobalMapPath(t *testing.T) {`
`70`	`70`	`}`
`71`	`71`	`block := v1.PersistentVolumeBlock`
`72`	`72`	`specMode := spec.PersistentVolume.Spec.VolumeMode`
`73`		`- if &specMode == nil {`
`74`		`- t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", &specMode, block)`
	`73`	`+ if specMode == nil {`
	`74`	`+ t.Fatalf("Failed to get volumeMode from PersistentVolumeBlock: %v", block)`
`75`	`75`	`}`
`76`	`76`	`if *specMode != block {`
`77`	`77`	`t.Errorf("Invalid volumeMode from GlobalMapPath spec: %v expected: %v", *specMode, block)`