Merge pull request kubernetes#90081 from gaurav1086/linux_nil_ptr_check

k8s-ci-robot · web-flow · commit 4f2f51602eea · 2020-04-16T04:55:01.000-07:00
[LINUX] call T.Fatalf() for nil ptr
diff --git a/pkg/volume/local/local_linux_test.go b/pkg/volume/local/local_linux_test.go
@@ -37,7 +37,7 @@ func TestFSGroupMount(t *testing.T) {
 	}
 	s := info.Sys().(*syscall.Stat_t)
 	if s == nil {
-		t.Errorf("Error getting stats for %s (%v)", tmpDir, err)
+		t.Fatalf("Error getting stats for %s (%v)", tmpDir, err)
 	}
 	fsGroup1 := int64(s.Gid)
 	fsGroup2 := fsGroup1 + 1
@@ -60,7 +60,7 @@ func TestFSGroupMount(t *testing.T) {
 	//Checking if GID of tmpDir has not been changed by mounting it by second pod
 	s = info.Sys().(*syscall.Stat_t)
 	if s == nil {
-		t.Errorf("Error getting stats for %s (%v)", tmpDir, err)
+		t.Fatalf("Error getting stats for %s (%v)", tmpDir, err)
 	}
 	if fsGroup1 != int64(s.Gid) {
 		t.Errorf("Old Gid %d for volume %s got overwritten by new Gid %d", fsGroup1, tmpDir, int64(s.Gid))

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestFSGroupMount(t *testing.T) {`
`37`	`37`	`}`
`38`	`38`	`s := info.Sys().(*syscall.Stat_t)`
`39`	`39`	`if s == nil {`
`40`		`- t.Errorf("Error getting stats for %s (%v)", tmpDir, err)`
	`40`	`+ t.Fatalf("Error getting stats for %s (%v)", tmpDir, err)`
`41`	`41`	`}`
`42`	`42`	`fsGroup1 := int64(s.Gid)`
`43`	`43`	`fsGroup2 := fsGroup1 + 1`
`@@ -60,7 +60,7 @@ func TestFSGroupMount(t *testing.T) {`
`60`	`60`	`//Checking if GID of tmpDir has not been changed by mounting it by second pod`
`61`	`61`	`s = info.Sys().(*syscall.Stat_t)`
`62`	`62`	`if s == nil {`
`63`		`- t.Errorf("Error getting stats for %s (%v)", tmpDir, err)`
	`63`	`+ t.Fatalf("Error getting stats for %s (%v)", tmpDir, err)`
`64`	`64`	`}`
`65`	`65`	`if fsGroup1 != int64(s.Gid) {`
`66`	`66`	`t.Errorf("Old Gid %d for volume %s got overwritten by new Gid %d", fsGroup1, tmpDir, int64(s.Gid))`