From 5d5f779db40528faa82e16c361691864dc80975b Mon Sep 17 00:00:00 2001 From: ianwoolf Date: Wed, 7 Apr 2021 13:42:22 +0800 Subject: [PATCH] net/http: replace os.MkdirTemp with T.TempDir Updates: #45402 Change-Id: Ia61f422d058bf57fc3688abc25597d6cc1692c51 Reviewed-on: https://go-review.googlesource.com/c/go/+/307653 Run-TryBot: Dave Cheney TryBot-Result: Go Bot Reviewed-by: Dave Cheney Reviewed-by: Emmanuel Odeke --- src/net/http/filetransport_test.go | 6 ++---- src/net/http/fs_test.go | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/net/http/filetransport_test.go b/src/net/http/filetransport_test.go index b58888dcb1..77fc8eeccf 100644 --- a/src/net/http/filetransport_test.go +++ b/src/net/http/filetransport_test.go @@ -23,12 +23,10 @@ func checker(t *testing.T) func(string, error) { func TestFileTransport(t *testing.T) { check := checker(t) - dname, err := os.MkdirTemp("", "") - check("TempDir", err) + dname := t.TempDir() fname := filepath.Join(dname, "foo.txt") - err = os.WriteFile(fname, []byte("Bar"), 0644) + err := os.WriteFile(fname, []byte("Bar"), 0644) check("WriteFile", err) - defer os.Remove(dname) defer os.Remove(fname) tr := &Transport{} diff --git a/src/net/http/fs_test.go b/src/net/http/fs_test.go index 0ebb511b5c..1bf207e0f7 100644 --- a/src/net/http/fs_test.go +++ b/src/net/http/fs_test.go @@ -378,11 +378,7 @@ func mustRemoveAll(dir string) { func TestFileServerImplicitLeadingSlash(t *testing.T) { defer afterTest(t) - tempDir, err := os.MkdirTemp("", "") - if err != nil { - t.Fatalf("TempDir: %v", err) - } - defer mustRemoveAll(tempDir) + tempDir := t.TempDir() if err := os.WriteFile(filepath.Join(tempDir, "foo.txt"), []byte("Hello world"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } -- 2.48.1