diff options
| author | Alexander Rakoczy <alex@golang.org> | 2020-12-14 11:42:42 -0500 |
|---|---|---|
| committer | Alexander Rakoczy <alex@golang.org> | 2020-12-14 11:42:42 -0500 |
| commit | 267975dc4732b6f6a62a7d33a85de34efef180b7 (patch) | |
| tree | fd69c51067a279d959b233b94bccf2bf969317a7 /src/os/exec/exec_test.go | |
| parent | 63bc23b5452f6605df3e40ce7ecdd8b0348792af (diff) | |
| parent | 6c64b6db6802818dd9a4789cdd564f19b70b6b4c (diff) | |
| download | go-git-267975dc4732b6f6a62a7d33a85de34efef180b7.tar.gz | |
Merge branch 'master' into dev.regabi
Change-Id: I098acdbc5e2676aeb8700d935e796a9c29d04b88
Diffstat (limited to 'src/os/exec/exec_test.go')
| -rw-r--r-- | src/os/exec/exec_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go index fc49b8a332..8b0c93f382 100644 --- a/src/os/exec/exec_test.go +++ b/src/os/exec/exec_test.go @@ -15,7 +15,6 @@ import ( "internal/poll" "internal/testenv" "io" - "io/ioutil" "log" "net" "net/http" @@ -386,7 +385,7 @@ func TestPipeLookPathLeak(t *testing.T) { // Reading /proc/self/fd is more reliable than calling lsof, so try that // first. numOpenFDs := func() (int, []byte, error) { - fds, err := ioutil.ReadDir("/proc/self/fd") + fds, err := os.ReadDir("/proc/self/fd") if err != nil { return 0, nil, err } @@ -645,7 +644,7 @@ func TestExtraFiles(t *testing.T) { t.Errorf("success trying to fetch %s; want an error", ts.URL) } - tf, err := ioutil.TempFile("", "") + tf, err := os.CreateTemp("", "") if err != nil { t.Fatalf("TempFile: %v", err) } |