Skip to content

Commit

Permalink
Format code with gofumpt, enable linter
Browse files Browse the repository at this point in the history 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
  • Loading branch information
@kolyshkin
kolyshkin committed Nov 3, 2021
1 parent b016007 commit d7d54c4
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 37 deletions.
1 change: 1 addition & 0 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ linters:
enable:
- unconvert
- errorlint
- gofumpt
24 changes: 12 additions & 12 deletions mount/mount_unix_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestMounted(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -47,18 +47,18 @@ func TestMounted(t *testing.T) {
targetPath = path.Join(targetDir, "file.txt")
)

if err := os.Mkdir(sourceDir, 0777); err != nil {
if err := os.Mkdir(sourceDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
if err := os.Mkdir(targetDir, 0o777); err != nil {
t.Fatal(err)
}

if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0o644); err != nil {
t.Fatal(err)
}

if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
if err := ioutil.WriteFile(targetPath, nil, 0o644); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -105,7 +105,7 @@ func TestMountTmpfsOptions(t *testing.T) {
}

target := path.Join(os.TempDir(), "mount-tmpfs-tests-"+t.Name())
if err := os.MkdirAll(target, 0777); err != nil {
if err := os.MkdirAll(target, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(target)
Expand Down Expand Up @@ -142,7 +142,7 @@ func TestMountReadonly(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -154,18 +154,18 @@ func TestMountReadonly(t *testing.T) {
targetPath = path.Join(targetDir, "file.txt")
)

if err := os.Mkdir(sourceDir, 0777); err != nil {
if err := os.Mkdir(sourceDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
if err := os.Mkdir(targetDir, 0o777); err != nil {
t.Fatal(err)
}

if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0644); err != nil {
if err := ioutil.WriteFile(sourcePath, []byte("hello"), 0o644); err != nil {
t.Fatal(err)
}

if err := ioutil.WriteFile(targetPath, nil, 0644); err != nil {
if err := ioutil.WriteFile(targetPath, nil, 0o644); err != nil {
t.Fatal(err)
}

Expand All @@ -178,7 +178,7 @@ func TestMountReadonly(t *testing.T) {
}
}()

if err := ioutil.WriteFile(targetPath, []byte("hello"), 0644); err == nil {
if err := ioutil.WriteFile(targetPath, []byte("hello"), 0o644); err == nil {
t.Fatal("Should not be able to open a ro file as rw")
}
}
Expand Down
1 change: 0 additions & 1 deletion mount/mounter_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ func mount(device, target, mType string, flags uintptr, data string) error {
flags: oflags | unix.MS_REMOUNT,
err: err,
}

}
}

Expand Down
40 changes: 20 additions & 20 deletions mount/sharedsubtree_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestSubtreePrivate(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -33,19 +33,19 @@ func TestSubtreePrivate(t *testing.T) {
outside1CheckPath = path.Join(targetDir, "a", "file.txt")
outside2CheckPath = path.Join(sourceDir, "b", "file.txt")
)
if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil {
if err := os.MkdirAll(path.Join(sourceDir, "b"), 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
if err := os.Mkdir(targetDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(outside1Dir, 0777); err != nil {
if err := os.Mkdir(outside1Dir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(outside2Dir, 0777); err != nil {
if err := os.Mkdir(outside2Dir, 0o777); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -119,7 +119,7 @@ func TestSubtreeShared(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -133,13 +133,13 @@ func TestSubtreeShared(t *testing.T) {
sourceCheckPath = path.Join(sourceDir, "a", "file.txt")
)

if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
if err := os.Mkdir(targetDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(outsideDir, 0777); err != nil {
if err := os.Mkdir(outsideDir, 0o777); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -191,7 +191,7 @@ func TestSubtreeSharedSlave(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -207,19 +207,19 @@ func TestSubtreeSharedSlave(t *testing.T) {
outside1CheckPath = path.Join(targetDir, "a", "file.txt")
outside2CheckPath = path.Join(sourceDir, "b", "file.txt")
)
if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
if err := os.MkdirAll(path.Join(sourceDir, "a"), 0o777); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil {
if err := os.MkdirAll(path.Join(sourceDir, "b"), 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(targetDir, 0777); err != nil {
if err := os.Mkdir(targetDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(outside1Dir, 0777); err != nil {
if err := os.Mkdir(outside1Dir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(outside2Dir, 0777); err != nil {
if err := os.Mkdir(outside2Dir, 0o777); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -299,7 +299,7 @@ func TestSubtreeUnbindable(t *testing.T) {
}

tmp := path.Join(os.TempDir(), "mount-tests")
if err := os.MkdirAll(tmp, 0777); err != nil {
if err := os.MkdirAll(tmp, 0o777); err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
Expand All @@ -308,10 +308,10 @@ func TestSubtreeUnbindable(t *testing.T) {
sourceDir = path.Join(tmp, "source")
targetDir = path.Join(tmp, "target")
)
if err := os.MkdirAll(sourceDir, 0777); err != nil {
if err := os.MkdirAll(sourceDir, 0o777); err != nil {
t.Fatal(err)
}
if err := os.MkdirAll(targetDir, 0777); err != nil {
if err := os.MkdirAll(targetDir, 0o777); err != nil {
t.Fatal(err)
}

Expand Down Expand Up @@ -339,5 +339,5 @@ func TestSubtreeUnbindable(t *testing.T) {
}

func createFile(path string) error {
return ioutil.WriteFile(path, []byte("hello"), 0666)
return ioutil.WriteFile(path, []byte("hello"), 0o666)
}
1 change: 0 additions & 1 deletion mountinfo/mountinfo_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,5 +770,4 @@ func TestUnescape(t *testing.T) {
continue
}
}

}
4 changes: 2 additions & 2 deletions symlink/fs_unix_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ func makeFs(tmpdir string, fs []dirOrLink) error {
for _, s := range fs {
s.path = filepath.Join(tmpdir, s.path)
if s.target == "" {
_ = os.MkdirAll(s.path, 0755)
_ = os.MkdirAll(s.path, 0o755)
continue
}
if err := os.MkdirAll(filepath.Dir(s.path), 0755); err != nil {
if err := os.MkdirAll(filepath.Dir(s.path), 0o755); err != nil {
return err
}
if err := os.Symlink(s.target, s.path); err != nil && !os.IsExist(err) {
Expand Down
2 changes: 1 addition & 1 deletion symlink/fs_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func walkSymlinks(path string) (string, error) {
}

// find next path component, p
var i = -1
i := -1
for j, c := range path {
if c < utf8RuneSelf && os.IsPathSeparator(uint8(c)) {
i = j
Expand Down

0 comments on commit d7d54c4

Please sign in to comment.