summaryrefslogtreecommitdiff
path: root/client/testserver/testserver.go
diff options
context:
space:
mode:
Diffstat (limited to 'client/testserver/testserver.go')
-rw-r--r--client/testserver/testserver.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go
index 0667cd4..c263aa0 100644
--- a/client/testserver/testserver.go
+++ b/client/testserver/testserver.go
@@ -3,7 +3,7 @@ package testserver
import (
"crypto/tls"
"crypto/x509"
- "io/ioutil"
+ "io"
"log"
"net"
"net/http"
@@ -18,7 +18,7 @@ import (
)
var (
- tempDir, _ = ioutil.TempDir("", "gitlab-shell-test-api")
+ tempDir, _ = os.MkdirTemp("", "gitlab-shell-test-api")
testSocket = path.Join(tempDir, "internal.sock")
)
@@ -41,7 +41,7 @@ func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) string {
Handler: buildHandler(handlers),
// We'll put this server through some nasty stuff we don't want
// in our test output
- ErrorLog: log.New(ioutil.Discard, "", 0),
+ ErrorLog: log.New(io.Discard, "", 0),
}
go server.Serve(socketListener)
@@ -76,7 +76,7 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath
server.TLS.BuildNameToCertificate()
if clientCAPath != "" {
- caCert, err := ioutil.ReadFile(clientCAPath)
+ caCert, err := os.ReadFile(clientCAPath)
require.NoError(t, err)
caCertPool := x509.NewCertPool()