Skip to content

Commit cf95922

Browse files
bepbep
committed
all: Run gofumpt -l -w .
1 parent a6023d2 commit cf95922

33 files changed

Lines changed: 182 additions & 178 deletions

‎afero.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ type Fs interface {
9797
// Chown changes the uid and gid of the named file.
9898
Chown(name string, uid, gid int) error
9999

100-
//Chtimes changes the access and modification times of the named file
100+
// Chtimes changes the access and modification times of the named file
101101
Chtimes(name string, atime time.Time, mtime time.Time) error
102102
}
103103

‎afero_test.go‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ import (
2828
"testing"
2929
)
3030

31-
var testName = "test.txt"
32-
var Fss = []Fs{&MemMapFs{}, &OsFs{}}
31+
var (
32+
testName = "test.txt"
33+
Fss = []Fs{&MemMapFs{}, &OsFs{}}
34+
)
3335

3436
var testRegistry map[Fs][]string = make(map[Fs][]string)
3537

@@ -45,7 +47,6 @@ func testDir(fs Fs) string {
4547

4648
func tmpFile(fs Fs) File {
4749
x, err := TempFile(fs, "", "afero")
48-
4950
if err != nil {
5051
panic(fmt.Sprint("unable to work with temp file", err))
5152
}
@@ -55,7 +56,7 @@ func tmpFile(fs Fs) File {
5556
return x
5657
}
5758

58-
//Read with length 0 should not return EOF.
59+
// Read with length 0 should not return EOF.
5960
func TestRead0(t *testing.T) {
6061
for _, fs := range Fss {
6162
f := tmpFile(fs)
@@ -83,31 +84,31 @@ func TestOpenFile(t *testing.T) {
8384
tmp := testDir(fs)
8485
path := filepath.Join(tmp, testName)
8586

86-
f, err := fs.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600)
87+
f, err := fs.OpenFile(path, os.O_RDWR|os.O_CREATE, 0o600)
8788
if err != nil {
8889
t.Error(fs.Name(), "OpenFile (O_CREATE) failed:", err)
8990
continue
9091
}
9192
io.WriteString(f, "initial")
9293
f.Close()
9394

94-
f, err = fs.OpenFile(path, os.O_WRONLY|os.O_APPEND, 0600)
95+
f, err = fs.OpenFile(path, os.O_WRONLY|os.O_APPEND, 0o600)
9596
if err != nil {
9697
t.Error(fs.Name(), "OpenFile (O_APPEND) failed:", err)
9798
continue
9899
}
99100
io.WriteString(f, "|append")
100101
f.Close()
101102

102-
f, _ = fs.OpenFile(path, os.O_RDONLY, 0600)
103+
f, _ = fs.OpenFile(path, os.O_RDONLY, 0o600)
103104
contents, _ := ioutil.ReadAll(f)
104105
expectedContents := "initial|append"
105106
if string(contents) != expectedContents {
106107
t.Errorf("%v: appending, expected '%v', got: '%v'", fs.Name(), expectedContents, string(contents))
107108
}
108109
f.Close()
109110

110-
f, err = fs.OpenFile(path, os.O_RDWR|os.O_TRUNC, 0600)
111+
f, err = fs.OpenFile(path, os.O_RDWR|os.O_TRUNC, 0o600)
111112
if err != nil {
112113
t.Error(fs.Name(), "OpenFile (O_TRUNC) failed:", err)
113114
continue
@@ -333,7 +334,7 @@ func TestSeek(t *testing.T) {
333334
whence int
334335
out int64
335336
}
336-
var tests = []test{
337+
tests := []test{
337338
{0, 1, int64(len(data))},
338339
{0, 0, 0},
339340
{5, 0, 5},
@@ -424,7 +425,7 @@ func setupTestDirReusePath(t *testing.T, fs Fs, path string) string {
424425

425426
func setupTestFiles(t *testing.T, fs Fs, path string) string {
426427
testSubDir := filepath.Join(path, "more", "subdirectories", "for", "testing", "we")
427-
err := fs.MkdirAll(testSubDir, 0700)
428+
err := fs.MkdirAll(testSubDir, 0o700)
428429
if err != nil && !os.IsExist(err) {
429430
t.Fatal(err)
430431
}
@@ -637,7 +638,7 @@ func TestReaddirAll(t *testing.T) {
637638
if err != nil {
638639
t.Fatal(err)
639640
}
640-
var namesRoot = []string{}
641+
namesRoot := []string{}
641642
for _, e := range rootInfo {
642643
namesRoot = append(namesRoot, e.Name())
643644
}
@@ -652,7 +653,7 @@ func TestReaddirAll(t *testing.T) {
652653
if err != nil {
653654
t.Fatal(err)
654655
}
655-
var namesSub = []string{}
656+
namesSub := []string{}
656657
for _, e := range subInfo {
657658
namesSub = append(namesSub, e.Name())
658659
}

‎basepath.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func (f *BasePathFile) Name() string {
4040
func (f *BasePathFile) ReadDir(n int) ([]fs.DirEntry, error) {
4141
if rdf, ok := f.File.(fs.ReadDirFile); ok {
4242
return rdf.ReadDir(n)
43-
4443
}
4544
return readDirFile{f.File}.ReadDir(n)
4645
}

‎basepath_test.go‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func TestBasePath(t *testing.T) {
1111
baseFs := &MemMapFs{}
12-
baseFs.MkdirAll("/base/path/tmp", 0777)
12+
baseFs.MkdirAll("/base/path/tmp", 0o777)
1313
bp := NewBasePathFs(baseFs, "/base/path")
1414

1515
if _, err := bp.Create("/tmp/foo"); err != nil {
@@ -23,8 +23,8 @@ func TestBasePath(t *testing.T) {
2323

2424
func TestBasePathRoot(t *testing.T) {
2525
baseFs := &MemMapFs{}
26-
baseFs.MkdirAll("/base/path/foo/baz", 0777)
27-
baseFs.MkdirAll("/base/path/boo/", 0777)
26+
baseFs.MkdirAll("/base/path/foo/baz", 0o777)
27+
baseFs.MkdirAll("/base/path/boo/", 0o777)
2828
bp := NewBasePathFs(baseFs, "/base/path")
2929

3030
rd, err := ReadDir(bp, string(os.PathSeparator))
@@ -56,7 +56,6 @@ func TestRealPath(t *testing.T) {
5656
subDir := filepath.Join(baseDir, "s1")
5757

5858
realPath, err := bp.RealPath("/s1")
59-
6059
if err != nil {
6160
t.Errorf("Got error %s", err)
6261
}
@@ -77,7 +76,6 @@ func TestRealPath(t *testing.T) {
7776
// is not inside the base file system.
7877
// The user will receive an os.ErrNotExist later.
7978
surrealPath, err := bp.RealPath(anotherDir)
80-
8179
if err != nil {
8280
t.Errorf("Got error %s", err)
8381
}
@@ -88,7 +86,6 @@ func TestRealPath(t *testing.T) {
8886
t.Errorf("Expected \n%s got \n%s", excpected, surrealPath)
8987
}
9088
}
91-
9289
}
9390

9491
func TestNestedBasePaths(t *testing.T) {
@@ -119,7 +116,7 @@ func TestNestedBasePaths(t *testing.T) {
119116
}
120117

121118
for _, s := range specs {
122-
if err := s.BaseFs.MkdirAll(s.FileName, 0755); err != nil {
119+
if err := s.BaseFs.MkdirAll(s.FileName, 0o755); err != nil {
123120
t.Errorf("Got error %s", err.Error())
124121
}
125122
if _, err := s.BaseFs.Stat(s.FileName); err != nil {
@@ -143,9 +140,9 @@ func TestNestedBasePaths(t *testing.T) {
143140

144141
func TestBasePathOpenFile(t *testing.T) {
145142
baseFs := &MemMapFs{}
146-
baseFs.MkdirAll("/base/path/tmp", 0777)
143+
baseFs.MkdirAll("/base/path/tmp", 0o777)
147144
bp := NewBasePathFs(baseFs, "/base/path")
148-
f, err := bp.OpenFile("/tmp/file.txt", os.O_CREATE, 0600)
145+
f, err := bp.OpenFile("/tmp/file.txt", os.O_CREATE, 0o600)
149146
if err != nil {
150147
t.Fatalf("failed to open file: %v", err)
151148
}
@@ -156,7 +153,7 @@ func TestBasePathOpenFile(t *testing.T) {
156153

157154
func TestBasePathCreate(t *testing.T) {
158155
baseFs := &MemMapFs{}
159-
baseFs.MkdirAll("/base/path/tmp", 0777)
156+
baseFs.MkdirAll("/base/path/tmp", 0o777)
160157
bp := NewBasePathFs(baseFs, "/base/path")
161158
f, err := bp.Create("/tmp/file.txt")
162159
if err != nil {
@@ -169,7 +166,7 @@ func TestBasePathCreate(t *testing.T) {
169166

170167
func TestBasePathTempFile(t *testing.T) {
171168
baseFs := &MemMapFs{}
172-
baseFs.MkdirAll("/base/path/tmp", 0777)
169+
baseFs.MkdirAll("/base/path/tmp", 0o777)
173170
bp := NewBasePathFs(baseFs, "/base/path")
174171

175172
tDir, err := TempDir(bp, "/tmp", "")

‎composite_test.go‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ func TestUnionCreateExisting(t *testing.T) {
5454
roBase := &ReadOnlyFs{source: base}
5555
ufs := NewCopyOnWriteFs(roBase, &MemMapFs{})
5656

57-
base.MkdirAll("/home/test", 0777)
57+
base.MkdirAll("/home/test", 0o777)
5858
fh, _ := base.Create("/home/test/file.txt")
5959
fh.WriteString("This is a test")
6060
fh.Close()
6161

62-
fh, err := ufs.OpenFile("/home/test/file.txt", os.O_RDWR, 0666)
62+
fh, err := ufs.OpenFile("/home/test/file.txt", os.O_RDWR, 0o666)
6363
if err != nil {
6464
t.Errorf("Failed to open file r/w: %s", err)
6565
}
@@ -95,7 +95,6 @@ func TestUnionCreateExisting(t *testing.T) {
9595
default:
9696
t.Errorf("Create failed on existing file")
9797
}
98-
9998
}
10099

101100
func TestUnionMergeReaddir(t *testing.T) {
@@ -104,7 +103,7 @@ func TestUnionMergeReaddir(t *testing.T) {
104103

105104
ufs := &CopyOnWriteFs{base: roBase, layer: &MemMapFs{}}
106105

107-
base.MkdirAll("/home/test", 0777)
106+
base.MkdirAll("/home/test", 0o777)
108107
fh, _ := base.Create("/home/test/file.txt")
109108
fh.WriteString("This is a test")
110109
fh.Close()
@@ -130,12 +129,12 @@ func TestExistingDirectoryCollisionReaddir(t *testing.T) {
130129

131130
ufs := &CopyOnWriteFs{base: roBase, layer: overlay}
132131

133-
base.MkdirAll("/home/test", 0777)
132+
base.MkdirAll("/home/test", 0o777)
134133
fh, _ := base.Create("/home/test/file.txt")
135134
fh.WriteString("This is a test")
136135
fh.Close()
137136

138-
overlay.MkdirAll("home/test", 0777)
137+
overlay.MkdirAll("home/test", 0o777)
139138
fh, _ = overlay.Create("/home/test/file2.txt")
140139
fh.WriteString("This is a test")
141140
fh.Close()
@@ -170,7 +169,7 @@ func TestNestedDirBaseReaddir(t *testing.T) {
170169

171170
ufs := &CopyOnWriteFs{base: roBase, layer: overlay}
172171

173-
base.MkdirAll("/home/test/foo/bar", 0777)
172+
base.MkdirAll("/home/test/foo/bar", 0o777)
174173
fh, _ := base.Create("/home/test/file.txt")
175174
fh.WriteString("This is a test")
176175
fh.Close()
@@ -182,7 +181,7 @@ func TestNestedDirBaseReaddir(t *testing.T) {
182181
fh.WriteString("This is a test")
183182
fh.Close()
184183

185-
overlay.MkdirAll("/", 0777)
184+
overlay.MkdirAll("/", 0o777)
186185

187186
// Opening something only in the base
188187
fh, _ = ufs.Open("/home/test/foo")
@@ -205,8 +204,8 @@ func TestNestedDirOverlayReaddir(t *testing.T) {
205204

206205
ufs := &CopyOnWriteFs{base: roBase, layer: overlay}
207206

208-
base.MkdirAll("/", 0777)
209-
overlay.MkdirAll("/home/test/foo/bar", 0777)
207+
base.MkdirAll("/", 0o777)
208+
overlay.MkdirAll("/home/test/foo/bar", 0o777)
210209
fh, _ := overlay.Create("/home/test/file.txt")
211210
fh.WriteString("This is a test")
212211
fh.Close()
@@ -239,8 +238,8 @@ func TestNestedDirOverlayOsFsReaddir(t *testing.T) {
239238

240239
ufs := &CopyOnWriteFs{base: roBase, layer: overlay}
241240

242-
base.MkdirAll("/", 0777)
243-
overlay.MkdirAll("/home/test/foo/bar", 0777)
241+
base.MkdirAll("/", 0o777)
242+
overlay.MkdirAll("/home/test/foo/bar", 0o777)
244243
fh, _ := overlay.Create("/home/test/file.txt")
245244
fh.WriteString("This is a test")
246245
fh.Close()
@@ -274,12 +273,12 @@ func TestCopyOnWriteFsWithOsFs(t *testing.T) {
274273

275274
ufs := &CopyOnWriteFs{base: roBase, layer: overlay}
276275

277-
base.MkdirAll("/home/test", 0777)
276+
base.MkdirAll("/home/test", 0o777)
278277
fh, _ := base.Create("/home/test/file.txt")
279278
fh.WriteString("This is a test")
280279
fh.Close()
281280

282-
overlay.MkdirAll("home/test", 0777)
281+
overlay.MkdirAll("home/test", 0o777)
283282
fh, _ = overlay.Create("/home/test/file2.txt")
284283
fh.WriteString("This is a test")
285284
fh.Close()
@@ -315,7 +314,7 @@ func TestUnionCacheWrite(t *testing.T) {
315314

316315
ufs := NewCacheOnReadFs(base, layer, 0)
317316

318-
base.Mkdir("/data", 0777)
317+
base.Mkdir("/data", 0o777)
319318

320319
fh, err := ufs.Create("/data/file.txt")
321320
if err != nil {
@@ -344,7 +343,7 @@ func TestUnionCacheExpire(t *testing.T) {
344343
layer := &MemMapFs{}
345344
ufs := &CacheOnReadFs{base: base, layer: layer, cacheTime: 1 * time.Second}
346345

347-
base.Mkdir("/data", 0777)
346+
base.Mkdir("/data", 0o777)
348347

349348
fh, err := ufs.Create("/data/file.txt")
350349
if err != nil {
@@ -449,7 +448,7 @@ func TestUnionFileReaddirDuplicateEmpty(t *testing.T) {
449448

450449
// Overlay shares same empty directory as base
451450
overlay := NewMemMapFs()
452-
err = overlay.Mkdir(dir, 0700)
451+
err = overlay.Mkdir(dir, 0o700)
453452
if err != nil {
454453
t.Fatal(err)
455454
}
@@ -479,7 +478,7 @@ func TestUnionFileReaddirAskForTooMany(t *testing.T) {
479478

480479
const testFiles = 5
481480
for i := 0; i < testFiles; i++ {
482-
WriteFile(base, fmt.Sprintf("file%d.txt", i), []byte("afero"), 0777)
481+
WriteFile(base, fmt.Sprintf("file%d.txt", i), []byte("afero"), 0o777)
483482
}
484483

485484
ufs := &CopyOnWriteFs{base: base, layer: overlay}

‎copyOnWriteFs.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
223223
return nil, err
224224
}
225225
if isaDir {
226-
if err = u.layer.MkdirAll(dir, 0777); err != nil {
226+
if err = u.layer.MkdirAll(dir, 0o777); err != nil {
227227
return nil, err
228228
}
229229
return u.layer.OpenFile(name, flag, perm)
@@ -247,8 +247,9 @@ func (u *CopyOnWriteFs) OpenFile(name string, flag int, perm os.FileMode) (File,
247247

248248
// This function handles the 9 different possibilities caused
249249
// by the union which are the intersection of the following...
250-
// layer: doesn't exist, exists as a file, and exists as a directory
251-
// base: doesn't exist, exists as a file, and exists as a directory
250+
//
251+
// layer: doesn't exist, exists as a file, and exists as a directory
252+
// base: doesn't exist, exists as a file, and exists as a directory
252253
func (u *CopyOnWriteFs) Open(name string) (File, error) {
253254
// Since the overlay overrides the base we check that first
254255
b, err := u.isBaseFile(name)
@@ -322,5 +323,5 @@ func (u *CopyOnWriteFs) MkdirAll(name string, perm os.FileMode) error {
322323
}
323324

324325
func (u *CopyOnWriteFs) Create(name string) (File, error) {
325-
return u.OpenFile(name, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0666)
326+
return u.OpenFile(name, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0o666)
326327
}

0 commit comments

Comments
 (0)