all: replace io/ioutil with io and os package

For golang/go#45557

Change-Id: I447530cc66896aef7a8d528ccb8d095b80e3cf47
GitHub-Last-Rev: 5f385ff46487ac318bd1147cdbbd26bb0ffd0426
GitHub-Pull-Request: golang/crypto#230
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/430797
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Meng Zhuo <mzh@golangcn.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
This commit is contained in:
cui fliter
2022-09-19 17:36:07 +00:00
committed by Gopher Robot
parent c86fa9a7ed
commit 35f4265a4b
30 changed files with 60 additions and 83 deletions
+1 -2
View File
@@ -12,7 +12,6 @@ package test
import (
"fmt"
"io"
"io/ioutil"
"net"
"strings"
"testing"
@@ -55,7 +54,7 @@ func testDial(t *testing.T, n, listenAddr string, x dialTester) {
}
x.TestClientConn(t, conn)
defer conn.Close()
b, err := ioutil.ReadAll(conn)
b, err := io.ReadAll(conn)
if err != nil {
t.Fatalf("ReadAll: %v", err)
}
+1 -2
View File
@@ -11,7 +11,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net"
"testing"
@@ -58,7 +57,7 @@ func testPortForward(t *testing.T, n, listenAddr string) {
readChan := make(chan []byte)
go func() {
data, _ := ioutil.ReadAll(netConn)
data, _ := io.ReadAll(netConn)
readChan <- data
}()
+3 -4
View File
@@ -14,7 +14,6 @@ import (
"crypto/rand"
"encoding/base64"
"fmt"
"io/ioutil"
"log"
"net"
"os"
@@ -151,7 +150,7 @@ func clientConfig() *ssh.ClientConfig {
// is used for connecting the Go SSH client with sshd without opening
// ports.
func unixConnection() (*net.UnixConn, *net.UnixConn, error) {
dir, err := ioutil.TempDir("", "unixConnection")
dir, err := os.MkdirTemp("", "unixConnection")
if err != nil {
return nil, nil, err
}
@@ -316,7 +315,7 @@ func newServerForConfig(t *testing.T, config string, configVars map[string]strin
if uname == "root" {
t.Skip("skipping test because current user is root")
}
dir, err := ioutil.TempDir("", "sshtest")
dir, err := os.MkdirTemp("", "sshtest")
if err != nil {
t.Fatal(err)
}
@@ -365,7 +364,7 @@ func newServerForConfig(t *testing.T, config string, configVars map[string]strin
}
func newTempSocket(t *testing.T) (string, func()) {
dir, err := ioutil.TempDir("", "socket")
dir, err := os.MkdirTemp("", "socket")
if err != nil {
t.Fatal(err)
}