Skip to content

Commit f60aa7a

Browse files
ianwoolfianlancetaylor
authored andcommitted
syscall: replace os.MkdirTemp with T.TempDir
Updates #45402 Change-Id: I573133d6b987e8ac23e3e2018652612af684c755 Reviewed-on: https://go-review.googlesource.com/c/go/+/307990 Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: Emmanuel Odeke <[email protected]>
1 parent fca51ba commit f60aa7a

File tree

4 files changed

+8
-32
lines changed

4 files changed

+8
-32
lines changed

src/syscall/dirent_test.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@ func TestDirent(t *testing.T) {
2727
filenameMinSize = 11
2828
)
2929

30-
d, err := os.MkdirTemp("", "dirent-test")
31-
if err != nil {
32-
t.Fatalf("tempdir: %v", err)
33-
}
34-
defer os.RemoveAll(d)
30+
d := t.TempDir()
3531
t.Logf("tmpdir: %s", d)
3632

3733
for i, c := range []byte("0123456789") {
3834
name := string(bytes.Repeat([]byte{c}, filenameMinSize+i))
39-
err = os.WriteFile(filepath.Join(d, name), nil, 0644)
35+
err := os.WriteFile(filepath.Join(d, name), nil, 0644)
4036
if err != nil {
4137
t.Fatalf("writefile: %v", err)
4238
}
@@ -93,18 +89,14 @@ func TestDirentRepeat(t *testing.T) {
9389
}
9490

9591
// Make a directory containing N files
96-
d, err := os.MkdirTemp("", "direntRepeat-test")
97-
if err != nil {
98-
t.Fatalf("tempdir: %v", err)
99-
}
100-
defer os.RemoveAll(d)
92+
d := t.TempDir()
10193

10294
var files []string
10395
for i := 0; i < N; i++ {
10496
files = append(files, fmt.Sprintf("file%d", i))
10597
}
10698
for _, file := range files {
107-
err = os.WriteFile(filepath.Join(d, file), []byte("contents"), 0644)
99+
err := os.WriteFile(filepath.Join(d, file), []byte("contents"), 0644)
108100
if err != nil {
109101
t.Fatalf("writefile: %v", err)
110102
}

src/syscall/getdirentries_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ func testGetdirentries(t *testing.T, count int) {
2929
if count > 100 && testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" {
3030
t.Skip("skipping in -short mode")
3131
}
32-
d, err := os.MkdirTemp("", "getdirentries-test")
33-
if err != nil {
34-
t.Fatalf("Tempdir: %v", err)
35-
}
36-
defer os.RemoveAll(d)
32+
d := t.TempDir()
3733
var names []string
3834
for i := 0; i < count; i++ {
3935
names = append(names, fmt.Sprintf("file%03d", i))

src/syscall/syscall_unix_test.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,12 @@ func TestFcntlFlock(t *testing.T) {
7979
}
8080
if os.Getenv("GO_WANT_HELPER_PROCESS") == "" {
8181
// parent
82-
tempDir, err := os.MkdirTemp("", "TestFcntlFlock")
83-
if err != nil {
84-
t.Fatalf("Failed to create temp dir: %v", err)
85-
}
82+
tempDir := t.TempDir()
8683
name := filepath.Join(tempDir, "TestFcntlFlock")
8784
fd, err := syscall.Open(name, syscall.O_CREAT|syscall.O_RDWR|syscall.O_CLOEXEC, 0)
8885
if err != nil {
8986
t.Fatalf("Open failed: %v", err)
9087
}
91-
defer os.RemoveAll(tempDir)
9288
defer syscall.Close(fd)
9389
if err := syscall.Ftruncate(fd, 1<<20); err != nil {
9490
t.Fatalf("Ftruncate(1<<20) failed: %v", err)
@@ -157,11 +153,7 @@ func TestPassFD(t *testing.T) {
157153

158154
}
159155

160-
tempDir, err := os.MkdirTemp("", "TestPassFD")
161-
if err != nil {
162-
t.Fatal(err)
163-
}
164-
defer os.RemoveAll(tempDir)
156+
tempDir := t.TempDir()
165157

166158
fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_STREAM, 0)
167159
if err != nil {

src/syscall/syscall_windows_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ import (
1212
)
1313

1414
func TestWin32finddata(t *testing.T) {
15-
dir, err := os.MkdirTemp("", "go-build")
16-
if err != nil {
17-
t.Fatalf("failed to create temp directory: %v", err)
18-
}
19-
defer os.RemoveAll(dir)
15+
dir := t.TempDir()
2016

2117
path := filepath.Join(dir, "long_name.and_extension")
2218
f, err := os.Create(path)

0 commit comments

Comments
 (0)