]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: replace os.MkdirTemp with T.TempDir
authorianwoolf <btw515wolf2@gmail.com>
Wed, 7 Apr 2021 05:42:22 +0000 (13:42 +0800)
committerEmmanuel Odeke <emmanuel@orijtech.com>
Wed, 7 Apr 2021 06:53:34 +0000 (06:53 +0000)
Updates: #45402
Change-Id: Ia61f422d058bf57fc3688abc25597d6cc1692c51
Reviewed-on: https://go-review.googlesource.com/c/go/+/307653
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
src/net/http/filetransport_test.go
src/net/http/fs_test.go

index b58888dcb146f074418930efd4bed5b38c5ee7b3..77fc8eeccf67601f7f4621ef0507d60a5a47cd44 100644 (file)
@@ -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{}
index 0ebb511b5c59434c3239ffd5e0f823e221c86228..1bf207e0f751bacc29984e1e7c71fa507c6ba6a5 100644 (file)
@@ -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)
        }