GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-08-31 06:16:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

unix: remove usage of ioutil.TempFile in tests

Browse Source 
Mostly change that to os.Create(filepath.Join(t.TempDir(), "filename"))
so that the cleanup is done automatically (and, because this is a new
directory, we do not need to have a "create unique temp file name"
logic).

While at it, fix some log/error messages -- if an error is coming from
e.g. os package, it is already wrapped, so there's no need to add more
context.

Change-Id: I62f13679f256b94095be5ca1e77a3fa302f01b97
Reviewed-on: https://go-review.googlesource.com/c/sys/+/526298
Reviewed-by: Heschi Kreinick <heschi@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Kirill Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2023-09-12 16:41:25 +00:00
committed by Gopher Robot
parent cb4ecd9fe9
commit fc717d344a
7 changed files with 47 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unix/syscall_zos_test.go
+9 -11
View File
@@ -124,11 +124,10 @@ func TestSignalNum(t *testing.T) {
func TestFcntlInt(t *testing.T) {
t.Parallel()
file, err := ioutil.TempFile("", "TestFnctlInt")
file, err := os.Create(filepath.Join(t.TempDir(), "TestFnctlInt"))
if err != nil {
t.Fatal(err)
}
defer os.Remove(file.Name())
defer file.Close()
f := file.Fd()
flags, err := unix.FcntlInt(f, unix.F_GETFD, 0)
@@ -291,9 +290,9 @@ func passFDChild() {
// We make it in tempDir, which our parent will clean up.
flag.Parse()
tempDir := flag.Arg(0)
f, err := ioutil.TempFile(tempDir, "")
f, err := os.Create(filepath.Join(tempDir, "file"))
if err != nil {
fmt.Printf("TempFile: %v", err)
fmt.Println(err)
return
}
@@ -424,11 +423,10 @@ func TestSetsockoptString(t *testing.T) {
}
func TestDup(t *testing.T) {
file, err := ioutil.TempFile("", "TestDup")
file, err := os.Create(filepath.Join(t.TempDir(), "TestDup"))
if err != nil {
t.Fatalf("Tempfile failed: %v", err)
t.Fatal(err)
}
defer os.Remove(file.Name())
defer file.Close()
f := int(file.Fd())
@@ -615,9 +613,9 @@ func TestMountUnmount(t *testing.T) {
func TestChroot(t *testing.T) {
// create temp dir and tempfile 1
tempDir := t.TempDir()
f, err := ioutil.TempFile(tempDir, "chroot_test_file")
f, err := os.Create(filepath.Join(tempDir, "chroot_test_file"))
if err != nil {
t.Fatalf("TempFile: %s", err.Error())
t.Fatal(err)
}
// chroot temp dir
err = unix.Chroot(tempDir)
@@ -667,9 +665,9 @@ func TestFlock(t *testing.T) {
}
} else {
// create temp dir and tempfile 1
f, err := ioutil.TempFile(t.TempDir(), "flock_test_file")
f, err := os.Create(filepath.Join(t.TempDir(), "flock_test_file"))
if err != nil {
t.Fatalf("TempFile: %s", err.Error())
t.Fatal(err)
}
fd := int(f.Fd())