Skip to content

Commit 94f3b55

Browse files
committed
Fix linter warnings
1 parent b0dc96e commit 94f3b55

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

pkg/volume/volume_linux_test.go

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,12 @@ func TestSkipPermissionChange(t *testing.T) {
126126
if err != nil {
127127
t.Fatalf("error creating temp dir: %v", err)
128128
}
129-
130-
defer os.RemoveAll(tmpDir)
129+
defer func() {
130+
err := os.RemoveAll(tmpDir)
131+
if err != nil {
132+
t.Fatalf("error removing tmpDir %s: %v", tmpDir, err)
133+
}
134+
}()
131135

132136
info, err := os.Lstat(tmpDir)
133137
if err != nil {
@@ -141,12 +145,12 @@ func TestSkipPermissionChange(t *testing.T) {
141145

142146
gid := stat.Gid
143147

144-
var expectedGid int64
148+
var expectedGID int64
145149

146150
if test.gidOwnerMatch {
147-
expectedGid = int64(gid)
151+
expectedGID = int64(gid)
148152
} else {
149-
expectedGid = int64(gid + 3000)
153+
expectedGID = int64(gid + 3000)
150154
}
151155

152156
mask := rwMask
@@ -169,7 +173,7 @@ func TestSkipPermissionChange(t *testing.T) {
169173
}
170174

171175
mounter := &localFakeMounter{path: tmpDir}
172-
ok = skipPermissionChange(mounter, tmpDir, &expectedGid, test.fsGroupChangePolicy)
176+
ok = skipPermissionChange(mounter, tmpDir, &expectedGID, test.fsGroupChangePolicy)
173177
if ok != test.skipPermssion {
174178
t.Errorf("for %s expected skipPermission to be %v got %v", test.description, test.skipPermssion, ok)
175179
}
@@ -288,7 +292,12 @@ func TestSetVolumeOwnershipMode(t *testing.T) {
288292
t.Fatalf("error creating temp dir: %v", err)
289293
}
290294

291-
defer os.RemoveAll(tmpDir)
295+
defer func() {
296+
err := os.RemoveAll(tmpDir)
297+
if err != nil {
298+
t.Fatalf("error removing tmpDir %s: %v", tmpDir, err)
299+
}
300+
}()
292301

293302
info, err := os.Lstat(tmpDir)
294303
if err != nil {
@@ -300,14 +309,14 @@ func TestSetVolumeOwnershipMode(t *testing.T) {
300309
t.Fatalf("error reading permission stats for tmpdir: %s", tmpDir)
301310
}
302311

303-
var expectedGid = int64(stat.Gid)
312+
var expectedGID = int64(stat.Gid)
304313
err = test.setupFunc(tmpDir)
305314
if err != nil {
306315
t.Errorf("for %s error running setup with: %v", test.description, err)
307316
}
308317

309318
mounter := &localFakeMounter{path: "FAKE_DIR_DOESNT_EXIST"} // SetVolumeOwnership() must rely on tmpDir
310-
ownershipChanger := NewVolumeOwnership(mounter, tmpDir, &expectedGid, test.fsGroupChangePolicy, nil)
319+
ownershipChanger := NewVolumeOwnership(mounter, tmpDir, &expectedGID, test.fsGroupChangePolicy, nil)
311320
err = ownershipChanger.ChangePermissions()
312321
if err != nil {
313322
t.Errorf("for %s error changing ownership with: %v", test.description, err)
@@ -475,7 +484,7 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
475484
if currentUid != 0 {
476485
t.Skip("running as non-root")
477486
}
478-
currentGid := os.Getgid()
487+
currentGID := os.Getgid()
479488

480489
tests := []struct {
481490
description string
@@ -497,7 +506,7 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
497506
},
498507
assertFunc: func(path string) error {
499508
filename := filepath.Join(path, "file.txt")
500-
if !verifyFileOwner(filename, currentUid, currentGid) {
509+
if !verifyFileOwner(filename, currentUid, currentGID) {
501510
return fmt.Errorf("invalid owner on %s", filename)
502511
}
503512
return nil
@@ -559,7 +568,12 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
559568
t.Fatalf("error creating temp dir: %v", err)
560569
}
561570

562-
defer os.RemoveAll(tmpDir)
571+
defer func() {
572+
err := os.RemoveAll(tmpDir)
573+
if err != nil {
574+
t.Fatalf("error removing tmpDir %s: %v", tmpDir, err)
575+
}
576+
}()
563577

564578
err = test.setupFunc(tmpDir)
565579
if err != nil {

0 commit comments

Comments
 (0)