felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

style: gofumpt all the things (#9829)

Browse Source 
Literally `gofumpt -w .` from the top level dir. Guaranteed to be minor
style changes only and nothing else.

@imsodin per request?
This commit is contained in:
Jakob Borg
2024-11-19 11:32:56 +01:00
committed by GitHub
parent 4b815fc086
commit e82ed6e3d3
88 changed files with 376 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cli_test.go
+1 -1
View File
@@ -23,7 +23,7 @@ func TestCLIReset(t *testing.T) {
// Create directories that reset will remove
for _, dir := range dirs {
err := os.Mkdir(dir, 0755)
err := os.Mkdir(dir, 0o755)
if err != nil && !os.IsExist(err) {
t.Fatal(err)
}
test/conflict_test.go
+23 -23
View File
@@ -87,7 +87,7 @@ func TestConflictsDefault(t *testing.T) {
t.Fatal(err)
}
fd, err = os.OpenFile("s1/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
fd, err = os.OpenFile("s1/testfile.txt", os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
t.Fatal(err)
}
@@ -100,7 +100,7 @@ func TestConflictsDefault(t *testing.T) {
t.Fatal(err)
}
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
t.Fatal(err)
}
@@ -150,7 +150,7 @@ func TestConflictsDefault(t *testing.T) {
t.Fatal(err)
}
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
t.Fatal(err)
}
@@ -204,37 +204,37 @@ func TestConflictsInitialMerge(t *testing.T) {
t.Fatal(err)
}
err = os.Mkdir("s1", 0755)
err = os.Mkdir("s1", 0o755)
if err != nil {
t.Fatal(err)
}
err = os.Mkdir("s2", 0755)
err = os.Mkdir("s2", 0o755)
if err != nil {
t.Fatal(err)
}
// File 1 is a conflict
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0o644)
if err != nil {
t.Fatal(err)
}
// File 2 exists on s1 only
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
// File 3 exists on s2 only
err = os.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file3", []byte("goodbye\n"), 0o644)
if err != nil {
t.Fatal(err)
}
@@ -303,26 +303,26 @@ func TestConflictsIndexReset(t *testing.T) {
t.Fatal(err)
}
err = os.Mkdir("s1", 0755)
err = os.Mkdir("s1", 0o755)
if err != nil {
t.Fatal(err)
}
err = os.Mkdir("s2", 0755)
err = os.Mkdir("s2", 0o755)
if err != nil {
t.Fatal(err)
}
// Three files on s1
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile("s2/file3", []byte("hello\n"), 0644)
err = os.WriteFile("s2/file3", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
@@ -370,7 +370,7 @@ func TestConflictsIndexReset(t *testing.T) {
// locally after we rest the index, unless we have a fix for that.
for i := 0; i < 5; i++ {
err = os.WriteFile("s2/file2", []byte("hello1\n"), 0644)
err = os.WriteFile("s2/file2", []byte("hello1\n"), 0o644)
if err != nil {
t.Fatal(err)
}
@@ -392,7 +392,7 @@ func TestConflictsIndexReset(t *testing.T) {
// s1/file1 (remote) changes while receiver is down
err = os.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s1/file1", []byte("goodbye\n"), 0o644)
if err != nil {
t.Fatal(err)
}
@@ -405,7 +405,7 @@ func TestConflictsIndexReset(t *testing.T) {
// s2/file2 (local) changes while receiver is down
err = os.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file2", []byte("goodbye\n"), 0o644)
if err != nil {
t.Fatal(err)
}
@@ -456,33 +456,33 @@ func TestConflictsSameContent(t *testing.T) {
t.Fatal(err)
}
err = os.Mkdir("s1", 0755)
err = os.Mkdir("s1", 0o755)
if err != nil {
t.Fatal(err)
}
err = os.Mkdir("s2", 0755)
err = os.Mkdir("s2", 0o755)
if err != nil {
t.Fatal(err)
}
// Two files on s1
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
// Two files on s2, content differs in file1 only, timestamps differ on both.
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0o644)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile("s2/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s2/file2", []byte("hello\n"), 0o644)
if err != nil {
t.Fatal(err)
}
test/delay_scan_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ func TestRescanWithDelay(t *testing.T) {
}
log.Println("Generating .stignore...")
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0o644)
if err != nil {
t.Fatal(err)
}
test/filetype_test.go
+3 -3
View File
@@ -90,14 +90,14 @@ func testFileTypeChange(t *testing.T) {
// A directory that we will replace with a file later
err = os.Mkdir("s1/emptyDirToReplace", 0755)
err = os.Mkdir("s1/emptyDirToReplace", 0o755)
if err != nil {
t.Fatal(err)
}
// A directory with files that we will replace with a file later
err = os.Mkdir("s1/dirToReplace", 0755)
err = os.Mkdir("s1/dirToReplace", 0o755)
if err != nil {
t.Fatal(err)
}
@@ -141,7 +141,7 @@ func testFileTypeChange(t *testing.T) {
if err != nil {
t.Fatal(err)
}
err = os.Mkdir("s1/fileToReplace", 0755)
err = os.Mkdir("s1/fileToReplace", 0o755)
if err != nil {
t.Fatal(err)
}
test/http_test.go
+1 -1
View File
@@ -223,7 +223,7 @@ func setupAPIBench() *rc.Process {
panic(err)
}
err = os.WriteFile("s1/knownfile", []byte("somedatahere"), 0644)
err = os.WriteFile("s1/knownfile", []byte("somedatahere"), 0o644)
if err != nil {
panic(err)
}
test/ignore_test.go
+3 -3
View File
@@ -35,7 +35,7 @@ func TestIgnores(t *testing.T) {
files := []string{"f1", "f2", "f3", "f4", "f11", "f12", "f13", "f14", "d1/f1.TXT"}
for _, dir := range dirs {
err := os.Mkdir(filepath.Join("s1", dir), 0755)
err := os.Mkdir(filepath.Join("s1", dir), 0o755)
if err != nil {
t.Fatal(err)
}
@@ -68,7 +68,7 @@ func TestIgnores(t *testing.T) {
err = os.WriteFile("s1/.stignore",
[]byte("f1*\nf2\nd1*\nd2\ns1*\ns2\n(?i)*.txt"), // [fds][34] only non-ignored items
0644)
0o644)
if err != nil {
t.Fatal(err)
}
@@ -91,7 +91,7 @@ func TestIgnores(t *testing.T) {
// Change the pattern to include some of the files and dirs previously ignored
time.Sleep(1100 * time.Millisecond)
err = os.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0o644)
// Rescan and verify that we see them
test/override_test.go
+1 -1
View File
@@ -90,7 +90,7 @@ func TestOverride(t *testing.T) {
log.Println("Changing file on sendRecv side...")
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0644)
fd, err = os.OpenFile("s2/testfile.txt", os.O_WRONLY|os.O_APPEND, 0o644)
if err != nil {
t.Fatal(err)
}
test/parallel_scan_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ func TestRescanInParallel(t *testing.T) {
}
log.Println("Generating .stignore...")
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0o644)
if err != nil {
t.Fatal(err)
}
test/reset_test.go
+3 -3
View File
@@ -28,7 +28,7 @@ func TestReset(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := os.Mkdir("s1", 0755); err != nil {
if err := os.Mkdir("s1", 0o755); err != nil {
t.Fatal(err)
}
@@ -53,7 +53,7 @@ func TestReset(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := os.Mkdir("s1", 0755); err != nil {
if err := os.Mkdir("s1", 0o755); err != nil {
t.Fatal(err)
}
if fd, err := os.Create("s1/.stfolder"); err != nil {
@@ -146,7 +146,7 @@ func createFiles(t *testing.T) int {
const n = 8
for i := 0; i < n; i++ {
file := fmt.Sprintf("f%d", i)
if err := os.WriteFile(filepath.Join("s1", file), []byte("data"), 0644); err != nil {
if err := os.WriteFile(filepath.Join("s1", file), []byte("data"), 0o644); err != nil {
t.Fatal(err)
}
}
test/scan_test.go
+3 -3
View File
@@ -82,7 +82,7 @@ func TestScanSubdir(t *testing.T) {
// 2
log.Println("Creating a file in an unknown directory")
os.MkdirAll("s1/filetest", 0755)
os.MkdirAll("s1/filetest", 0o755)
if fd, err := os.Create("s1/filetest/file1.txt"); err != nil {
t.Fatal(err)
} else {
@@ -101,7 +101,7 @@ func TestScanSubdir(t *testing.T) {
// 3
log.Println("Creating a file in an unknown deep directory")
os.MkdirAll("s1/filetest/1/2/3/4/5/6/7", 0755)
os.MkdirAll("s1/filetest/1/2/3/4/5/6/7", 0o755)
if fd, err := os.Create("s1/filetest/1/2/3/4/5/6/7/file1.txt"); err != nil {
t.Fatal(err)
} else {
@@ -120,7 +120,7 @@ func TestScanSubdir(t *testing.T) {
// 4
log.Println("Creating a directory in an unknown directory")
err = os.MkdirAll("s1/dirtest/1/2/3/4/5/6/7", 0755)
err = os.MkdirAll("s1/dirtest/1/2/3/4/5/6/7", 0o755)
if err != nil {
t.Fatal(err)
}
test/symlink_test.go
+3 -3
View File
@@ -102,7 +102,7 @@ func testSymlinks(t *testing.T) {
// A directory that we will replace with a symlink later
err = os.Mkdir("s1/dirToReplace", 0755)
err = os.Mkdir("s1/dirToReplace", 0o755)
if err != nil {
t.Fatal(err)
}
@@ -121,7 +121,7 @@ func testSymlinks(t *testing.T) {
// A directory and a symlink to that directory
err = os.Mkdir("s1/dir", 0755)
err = os.Mkdir("s1/dir", 0o755)
if err != nil {
t.Fatal(err)
}
@@ -218,7 +218,7 @@ func testSymlinks(t *testing.T) {
log.Fatal(err)
}
err = os.Mkdir("s1/repDirLink", 0755)
err = os.Mkdir("s1/repDirLink", 0o755)
if err != nil {
log.Fatal(err)
}
test/sync_test.go
+2 -2
View File
@@ -203,7 +203,7 @@ func TestSyncCluster(t *testing.T) {
if err != nil {
t.Fatal(err)
}
fd, err := os.OpenFile("s1/test-appendfile", os.O_APPEND|os.O_WRONLY, 0644)
fd, err := os.OpenFile("s1/test-appendfile", os.O_APPEND|os.O_WRONLY, 0o644)
if err != nil {
t.Fatal(err)
}
@@ -326,7 +326,7 @@ func TestSyncSparseFile(t *testing.T) {
log.Println("Generating files...")
if err := os.Mkdir("s1", 0755); err != nil {
if err := os.Mkdir("s1", 0o755); err != nil {
t.Fatal(err)
}
test/transfer-bench_test.go
+6 -1
View File
@@ -26,18 +26,23 @@ func TestBenchmarkTransferManyFiles(t *testing.T) {
func TestBenchmarkTransferLargeFile1G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 30)
}
func TestBenchmarkTransferLargeFile2G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 31)
}
func TestBenchmarkTransferLargeFile4G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 32)
}
func TestBenchmarkTransferLargeFile8G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 33)
}
func TestBenchmarkTransferLargeFile16G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 34)
}
func TestBenchmarkTransferLargeFile32G(t *testing.T) {
setupAndBenchmarkTransfer(t, 1, 35)
}
@@ -54,7 +59,7 @@ func setupAndBenchmarkTransfer(t *testing.T, files, sizeExp int) {
if err != nil {
t.Fatal(err)
}
err = os.MkdirAll("s1", 0755)
err = os.MkdirAll("s1", 0o755)
if err != nil {
t.Fatal(err)
}
test/util.go
+7 -7
View File
@@ -60,7 +60,7 @@ func generateFilesWithTime(dir string, files, maxexp int, srcname string, t0 tim
}
p0 := filepath.Join(dir, string(n[0]), n[0:2])
err = os.MkdirAll(p0, 0755)
err = os.MkdirAll(p0, 0o755)
if err != nil {
log.Fatal(err)
}
@@ -99,7 +99,7 @@ func generateOneFile(fd io.ReadSeeker, p1 string, s int64, t0 time.Time) error {
return err
}
os.Chmod(p1, os.FileMode(rand.Intn(0777)|0400))
os.Chmod(p1, os.FileMode(rand.Intn(0o777)|0o400))
t := t0.Add(-time.Duration(rand.Intn(30*86400)) * time.Second)
err = os.Chtimes(p1, t, t)
@@ -149,15 +149,15 @@ func alterFiles(dir string) error {
return removeAll(path)
case r == 1 && info.Mode().IsRegular():
if info.Mode()&0200 != 0200 {
if info.Mode()&0o200 != 0o200 {
// Not owner writable. Fix.
if err = os.Chmod(path, 0644); err != nil {
if err = os.Chmod(path, 0o644); err != nil {
return err
}
}
// Overwrite a random kilobyte of every tenth file
fd, err := os.OpenFile(path, os.O_RDWR, 0644)
fd, err := os.OpenFile(path, os.O_RDWR, 0o644)
if err != nil {
return err
}
@@ -291,8 +291,8 @@ func removeAll(dirs ...string) error {
if err != nil {
return err
}
if info.Mode()&0700 != 0700 {
os.Chmod(path, 0777)
if info.Mode()&0o700 != 0o700 {
os.Chmod(path, 0o777)
}
return nil
})