diff options
Diffstat (limited to 'tests/defaults')
| -rw-r--r-- | tests/defaults/acl_test.go | 11 | ||||
| -rw-r--r-- | tests/defaults/diriv_test.go | 5 | ||||
| -rw-r--r-- | tests/defaults/main_test.go | 7 | ||||
| -rw-r--r-- | tests/defaults/overlayfs_test.go | 7 | ||||
| -rw-r--r-- | tests/defaults/performance_test.go | 3 | 
5 files changed, 14 insertions, 19 deletions
| diff --git a/tests/defaults/acl_test.go b/tests/defaults/acl_test.go index 2ab5dc1..0dae018 100644 --- a/tests/defaults/acl_test.go +++ b/tests/defaults/acl_test.go @@ -1,7 +1,6 @@  package defaults  import ( -	"io/ioutil"  	"math/rand"  	"os"  	"os/exec" @@ -35,7 +34,7 @@ func TestCpA(t *testing.T) {  		var modeWant os.FileMode = os.FileMode(rand.Int31n(0777+1) | 0400)  		// Create file outside mount -		err := ioutil.WriteFile(fn1, nil, modeWant) +		err := os.WriteFile(fn1, nil, modeWant)  		if err != nil {  			t.Fatal(err)  		} @@ -45,7 +44,7 @@ func TestCpA(t *testing.T) {  			t.Fatal(err)  		}  		if fi.Mode() != modeWant { -			t.Errorf("ioutil.WriteFile created wrong permissions: want %o have %o", modeWant, fi.Mode()) +			t.Errorf("os.WriteFile created wrong permissions: want %o have %o", modeWant, fi.Mode())  		}  		// "cp -a" from outside to inside mount @@ -93,7 +92,7 @@ func TestAcl543(t *testing.T) {  	}  	// Set acl on file outside gocryptfs mount -	err := ioutil.WriteFile(fn1, nil, modeWant) +	err := os.WriteFile(fn1, nil, modeWant)  	if err != nil {  		t.Fatal(err)  	} @@ -117,7 +116,7 @@ func TestAcl543(t *testing.T) {  	}  	// Set acl on file inside gocryptfs mount -	err = ioutil.WriteFile(fn2, nil, modeWant) +	err = os.WriteFile(fn2, nil, modeWant)  	if err != nil {  		t.Fatal(err)  	} @@ -164,7 +163,7 @@ func TestAcl543(t *testing.T) {  // Check that we handle zero-sized and undersized buffers correctly  func TestXattrOverflow(t *testing.T) {  	fn := filepath.Join(test_helpers.DefaultPlainDir, t.Name()) -	ioutil.WriteFile(fn, nil, 0600) +	os.WriteFile(fn, nil, 0600)  	attr := "user.foo123"  	val := []byte("12341234") diff --git a/tests/defaults/diriv_test.go b/tests/defaults/diriv_test.go index 639b33d..48ba39a 100644 --- a/tests/defaults/diriv_test.go +++ b/tests/defaults/diriv_test.go @@ -1,7 +1,6 @@  package defaults  import ( -	"io/ioutil"  	"os"  	"sync"  	"sync/atomic" @@ -19,7 +18,7 @@ func TestDirIVRace(t *testing.T) {  	if err != nil {  		t.Fatal(err)  	} -	err = ioutil.WriteFile(dir1+"/file", nil, 0600) +	err = os.WriteFile(dir1+"/file", nil, 0600)  	if err != nil {  		t.Fatal(err)  	} @@ -31,7 +30,7 @@ func TestDirIVRace(t *testing.T) {  		t.Fatal(err)  	}  	file2 := dir2 + "/file" -	err = ioutil.WriteFile(file2, nil, 0600) +	err = os.WriteFile(file2, nil, 0600)  	if err != nil {  		t.Fatal(err)  	} diff --git a/tests/defaults/main_test.go b/tests/defaults/main_test.go index 75a5dae..a19f079 100644 --- a/tests/defaults/main_test.go +++ b/tests/defaults/main_test.go @@ -5,7 +5,6 @@ import (  	"bytes"  	"fmt"  	"io" -	"io/ioutil"  	"os"  	"os/exec"  	"path/filepath" @@ -176,7 +175,7 @@ func TestXfs124(t *testing.T) {  func TestWrite0200File(t *testing.T) {  	fn := test_helpers.DefaultPlainDir + "/TestWrite0200File" -	err := ioutil.WriteFile(fn, nil, 0200) +	err := os.WriteFile(fn, nil, 0200)  	if err != nil {  		t.Fatalf("creating empty file failed: %v", err)  	} @@ -212,7 +211,7 @@ func TestWrite0200File(t *testing.T) {  // Now we return EOPNOTSUPP and mv is happy.  func TestMvWarnings(t *testing.T) {  	fn := test_helpers.TmpDir + "/TestMvWarnings" -	err := ioutil.WriteFile(fn, nil, 0600) +	err := os.WriteFile(fn, nil, 0600)  	if err != nil {  		t.Fatalf("creating file failed: %v", err)  	} @@ -257,7 +256,7 @@ func TestMvWarningSymlink(t *testing.T) {  // See TestMvWarnings.  func TestCpWarnings(t *testing.T) {  	fn := test_helpers.TmpDir + "/TestCpWarnings" -	err := ioutil.WriteFile(fn, []byte("foo"), 0600) +	err := os.WriteFile(fn, []byte("foo"), 0600)  	if err != nil {  		t.Fatalf("creating file failed: %v", err)  	} diff --git a/tests/defaults/overlayfs_test.go b/tests/defaults/overlayfs_test.go index 8cb773d..2b374b1 100644 --- a/tests/defaults/overlayfs_test.go +++ b/tests/defaults/overlayfs_test.go @@ -4,7 +4,6 @@  package defaults  import ( -	"io/ioutil"  	"os"  	"strings"  	"testing" @@ -43,7 +42,7 @@ func TestRenameWhiteout(t *testing.T) {  		for _, n := range names {  			pSrc := test_helpers.DefaultPlainDir + "/" + n[0]  			pDst := test_helpers.DefaultPlainDir + "/" + n[1] -			if err := ioutil.WriteFile(pSrc, nil, 0200); err != nil { +			if err := os.WriteFile(pSrc, nil, 0200); err != nil {  				t.Fatalf("creating empty file failed: %v", err)  			}  			err := unix.Renameat2(-1, pSrc, -1, pDst, flags) @@ -96,10 +95,10 @@ func TestRenameExchange(t *testing.T) {  	for _, n := range names {  		pSrc := test_helpers.DefaultPlainDir + "/" + n[0]  		pDst := test_helpers.DefaultPlainDir + "/" + n[1] -		if err := ioutil.WriteFile(pSrc, nil, 0200); err != nil { +		if err := os.WriteFile(pSrc, nil, 0200); err != nil {  			t.Fatalf("creating empty file failed: %v", err)  		} -		if err := ioutil.WriteFile(pDst, nil, 0200); err != nil { +		if err := os.WriteFile(pDst, nil, 0200); err != nil {  			t.Fatalf("creating empty file failed: %v", err)  		}  		err := unix.Renameat2(-1, pSrc, -1, pDst, unix.RENAME_EXCHANGE) diff --git a/tests/defaults/performance_test.go b/tests/defaults/performance_test.go index 11d827f..8bae5c1 100644 --- a/tests/defaults/performance_test.go +++ b/tests/defaults/performance_test.go @@ -4,7 +4,6 @@ package defaults  import (  	"fmt"  	"io" -	"io/ioutil"  	"os"  	"testing" @@ -96,7 +95,7 @@ func createFiles(t *testing.B, count int, size int) {  	for i = 0; i < count; i++ {  		file := fmt.Sprintf("%s/%d", dir, i)  		if size > 0 { -			err = ioutil.WriteFile(file, buf, 0666) +			err = os.WriteFile(file, buf, 0666)  		} else {  			var fh *os.File  			fh, err = os.Create(file) | 
