@@ -126,8 +126,12 @@ func TestSkipPermissionChange(t *testing.T) {
126
126
if err != nil {
127
127
t .Fatalf ("error creating temp dir: %v" , err )
128
128
}
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
+ }()
131
135
132
136
info , err := os .Lstat (tmpDir )
133
137
if err != nil {
@@ -141,12 +145,12 @@ func TestSkipPermissionChange(t *testing.T) {
141
145
142
146
gid := stat .Gid
143
147
144
- var expectedGid int64
148
+ var expectedGID int64
145
149
146
150
if test .gidOwnerMatch {
147
- expectedGid = int64 (gid )
151
+ expectedGID = int64 (gid )
148
152
} else {
149
- expectedGid = int64 (gid + 3000 )
153
+ expectedGID = int64 (gid + 3000 )
150
154
}
151
155
152
156
mask := rwMask
@@ -169,7 +173,7 @@ func TestSkipPermissionChange(t *testing.T) {
169
173
}
170
174
171
175
mounter := & localFakeMounter {path : tmpDir }
172
- ok = skipPermissionChange (mounter , tmpDir , & expectedGid , test .fsGroupChangePolicy )
176
+ ok = skipPermissionChange (mounter , tmpDir , & expectedGID , test .fsGroupChangePolicy )
173
177
if ok != test .skipPermssion {
174
178
t .Errorf ("for %s expected skipPermission to be %v got %v" , test .description , test .skipPermssion , ok )
175
179
}
@@ -288,7 +292,12 @@ func TestSetVolumeOwnershipMode(t *testing.T) {
288
292
t .Fatalf ("error creating temp dir: %v" , err )
289
293
}
290
294
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
+ }()
292
301
293
302
info , err := os .Lstat (tmpDir )
294
303
if err != nil {
@@ -300,14 +309,14 @@ func TestSetVolumeOwnershipMode(t *testing.T) {
300
309
t .Fatalf ("error reading permission stats for tmpdir: %s" , tmpDir )
301
310
}
302
311
303
- var expectedGid = int64 (stat .Gid )
312
+ var expectedGID = int64 (stat .Gid )
304
313
err = test .setupFunc (tmpDir )
305
314
if err != nil {
306
315
t .Errorf ("for %s error running setup with: %v" , test .description , err )
307
316
}
308
317
309
318
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 )
311
320
err = ownershipChanger .ChangePermissions ()
312
321
if err != nil {
313
322
t .Errorf ("for %s error changing ownership with: %v" , test .description , err )
@@ -475,7 +484,7 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
475
484
if currentUid != 0 {
476
485
t .Skip ("running as non-root" )
477
486
}
478
- currentGid := os .Getgid ()
487
+ currentGID := os .Getgid ()
479
488
480
489
tests := []struct {
481
490
description string
@@ -497,7 +506,7 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
497
506
},
498
507
assertFunc : func (path string ) error {
499
508
filename := filepath .Join (path , "file.txt" )
500
- if ! verifyFileOwner (filename , currentUid , currentGid ) {
509
+ if ! verifyFileOwner (filename , currentUid , currentGID ) {
501
510
return fmt .Errorf ("invalid owner on %s" , filename )
502
511
}
503
512
return nil
@@ -559,7 +568,12 @@ func TestSetVolumeOwnershipOwner(t *testing.T) {
559
568
t .Fatalf ("error creating temp dir: %v" , err )
560
569
}
561
570
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
+ }()
563
577
564
578
err = test .setupFunc (tmpDir )
565
579
if err != nil {
0 commit comments