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

all: Remove usage of deprecated io/ioutil (#7971)

Browse Source 
As of Go 1.16 io/ioutil is deprecated. This replaces usage with the
corresponding functions in package os and package io.
This commit is contained in:
Jakob Borg
2021-11-22 08:59:47 +01:00
committed by GitHub
parent bf89bffb0b
commit 4b750b6dc3
71 changed files with 190 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/conflict_test.go
+15 -16
View File
@@ -11,7 +11,6 @@ package integration
import (
"bytes"
"io/ioutil"
"log"
"os"
"path/filepath"
@@ -189,7 +188,7 @@ func TestConflictsDefault(t *testing.T) {
if len(files) != 1 {
t.Errorf("Expected 1 conflicted files instead of %d", len(files))
}
bs, err := ioutil.ReadFile("s1/testfile.txt")
bs, err := os.ReadFile("s1/testfile.txt")
if err != nil {
t.Error("reading file:", err)
}
@@ -216,26 +215,26 @@ func TestConflictsInitialMerge(t *testing.T) {
// File 1 is a conflict
err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
if err != nil {
t.Fatal(err)
}
// File 2 exists on s1 only
err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
// File 3 exists on s2 only
err = ioutil.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file3", []byte("goodbye\n"), 0644)
if err != nil {
t.Fatal(err)
}
@@ -315,15 +314,15 @@ func TestConflictsIndexReset(t *testing.T) {
// Three files on s1
err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
err = ioutil.WriteFile("s2/file3", []byte("hello\n"), 0644)
err = os.WriteFile("s2/file3", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
@@ -371,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 = ioutil.WriteFile("s2/file2", []byte("hello1\n"), 0644)
err = os.WriteFile("s2/file2", []byte("hello1\n"), 0644)
if err != nil {
t.Fatal(err)
}
@@ -393,7 +392,7 @@ func TestConflictsIndexReset(t *testing.T) {
// s1/file1 (remote) changes while receiver is down
err = ioutil.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s1/file1", []byte("goodbye\n"), 0644)
if err != nil {
t.Fatal(err)
}
@@ -406,7 +405,7 @@ func TestConflictsIndexReset(t *testing.T) {
// s2/file2 (local) changes while receiver is down
err = ioutil.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file2", []byte("goodbye\n"), 0644)
if err != nil {
t.Fatal(err)
}
@@ -468,22 +467,22 @@ func TestConflictsSameContent(t *testing.T) {
// Two files on s1
err = ioutil.WriteFile("s1/file1", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file1", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
err = ioutil.WriteFile("s1/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s1/file2", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
// Two files on s2, content differs in file1 only, timestamps differ on both.
err = ioutil.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
err = os.WriteFile("s2/file1", []byte("goodbye\n"), 0644)
if err != nil {
t.Fatal(err)
}
err = ioutil.WriteFile("s2/file2", []byte("hello\n"), 0644)
err = os.WriteFile("s2/file2", []byte("hello\n"), 0644)
if err != nil {
t.Fatal(err)
}
test/delay_scan_test.go
+2 -2
View File
@@ -10,8 +10,8 @@
package integration
import (
"io/ioutil"
"log"
"os"
"sync"
"testing"
"time"
@@ -31,7 +31,7 @@ func TestRescanWithDelay(t *testing.T) {
}
log.Println("Generating .stignore...")
err = ioutil.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
if err != nil {
t.Fatal(err)
}
test/http_test.go
+5 -4
View File
@@ -11,8 +11,9 @@ package integration
import (
"bytes"
"io/ioutil"
"io"
"net/http"
"os"
"strings"
"testing"
@@ -33,7 +34,7 @@ func TestHTTPGetIndex(t *testing.T) {
if res.StatusCode != 200 {
t.Errorf("Status %d != 200", res.StatusCode)
}
bs, err := ioutil.ReadAll(res.Body)
bs, err := io.ReadAll(res.Body)
if err != nil {
t.Fatal(err)
}
@@ -57,7 +58,7 @@ func TestHTTPGetIndex(t *testing.T) {
if res.StatusCode != 200 {
t.Errorf("Status %d != 200", res.StatusCode)
}
bs, err = ioutil.ReadAll(res.Body)
bs, err = io.ReadAll(res.Body)
if err != nil {
t.Fatal(err)
}
@@ -222,7 +223,7 @@ func setupAPIBench() *rc.Process {
panic(err)
}
err = ioutil.WriteFile("s1/knownfile", []byte("somedatahere"), 0644)
err = os.WriteFile("s1/knownfile", []byte("somedatahere"), 0644)
if err != nil {
panic(err)
}
test/ignore_test.go
+2 -3
View File
@@ -10,7 +10,6 @@
package integration
import (
"io/ioutil"
"log"
"os"
"path/filepath"
@@ -67,7 +66,7 @@ func TestIgnores(t *testing.T) {
// Add some of them to an ignore file
err = ioutil.WriteFile("s1/.stignore",
err = os.WriteFile("s1/.stignore",
[]byte("f1*\nf2\nd1*\nd2\ns1*\ns2\n(?i)*.txt"), // [fds][34] only non-ignored items
0644)
if err != nil {
@@ -92,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 = ioutil.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("f2\nd2\ns2\n"), 0644)
// Rescan and verify that we see them
test/override_test.go
+8 -8
View File
@@ -10,7 +10,7 @@
package integration
import (
"io/ioutil"
"io"
"log"
"os"
"strings"
@@ -127,7 +127,7 @@ func TestOverride(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err := ioutil.ReadAll(fd)
bs, err := io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -141,7 +141,7 @@ func TestOverride(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err = ioutil.ReadAll(fd)
bs, err = io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -295,7 +295,7 @@ func TestOverrideIgnores(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err := ioutil.ReadAll(fd)
bs, err := io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -309,7 +309,7 @@ func TestOverrideIgnores(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err = ioutil.ReadAll(fd)
bs, err = io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -337,7 +337,7 @@ func TestOverrideIgnores(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err = ioutil.ReadAll(fd)
bs, err = io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -388,7 +388,7 @@ func TestOverrideIgnores(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err = ioutil.ReadAll(fd)
bs, err = io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
@@ -423,7 +423,7 @@ func TestOverrideIgnores(t *testing.T) {
if err != nil {
t.Fatal(err)
}
bs, err = ioutil.ReadAll(fd)
bs, err = io.ReadAll(fd)
if err != nil {
t.Fatal(err)
}
test/parallell_scan_test.go
+2 -2
View File
@@ -10,8 +10,8 @@
package integration
import (
"io/ioutil"
"log"
"os"
"sync"
"testing"
"time"
@@ -31,7 +31,7 @@ func TestRescanInParallel(t *testing.T) {
}
log.Println("Generating .stignore...")
err = ioutil.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
err = os.WriteFile("s1/.stignore", []byte("some ignore data\n"), 0644)
if err != nil {
t.Fatal(err)
}
test/reset_test.go
+1 -2
View File
@@ -13,7 +13,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path/filepath"
@@ -147,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 := ioutil.WriteFile(filepath.Join("s1", file), []byte("data"), 0644); err != nil {
if err := os.WriteFile(filepath.Join("s1", file), []byte("data"), 0644); err != nil {
t.Fatal(err)
}
}
test/util.go
+2 -3
View File
@@ -14,7 +14,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"math/rand"
"os"
@@ -206,7 +205,7 @@ func alterFiles(dir string) error {
return err
}
d1 := []byte("I used to be a dir: " + path)
err := ioutil.WriteFile(path, d1, 0644)
err := os.WriteFile(path, d1, 0644)
if err != nil {
return err
}
@@ -551,7 +550,7 @@ func startInstance(t *testing.T, i int) *rc.Process {
}
func symlinksSupported() bool {
tmp, err := ioutil.TempDir("", "symlink-test")
tmp, err := os.MkdirTemp("", "symlink-test")
if err != nil {
return false
}