Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 15:08:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-09 15:08:25 +0300
commit48d25238c386a89e8a6af218eeb290936a8f7595 (patch)
tree68943880d54468655d103dd6ef0aafbba246c532 /workhorse/internal/upload/artifacts_upload_test.go
parent5f2a8d5813e1123f06fa7b43d404ea524d9215fc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/upload/artifacts_upload_test.go')
-rw-r--r--workhorse/internal/upload/artifacts_upload_test.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/workhorse/internal/upload/artifacts_upload_test.go b/workhorse/internal/upload/artifacts_upload_test.go
index 0837509fadb..c94129092c6 100644
--- a/workhorse/internal/upload/artifacts_upload_test.go
+++ b/workhorse/internal/upload/artifacts_upload_test.go
@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"io"
- "io/ioutil"
"mime/multipart"
"net/http"
"net/http/httptest"
@@ -72,7 +71,7 @@ func testArtifactsUploadServer(t *testing.T, authResponse *api.Response, bodyPro
return
}
- _, err := ioutil.ReadFile(r.FormValue("file.path"))
+ _, err := os.ReadFile(r.FormValue("file.path"))
if err != nil {
t.Fatal("Expected file to be readable")
return
@@ -85,7 +84,7 @@ func testArtifactsUploadServer(t *testing.T, authResponse *api.Response, bodyPro
}
if r.FormValue("metadata.path") != "" {
- metadata, err := ioutil.ReadFile(r.FormValue("metadata.path"))
+ metadata, err := os.ReadFile(r.FormValue("metadata.path"))
if err != nil {
t.Fatal("Expected metadata to be readable")
return
@@ -96,7 +95,7 @@ func testArtifactsUploadServer(t *testing.T, authResponse *api.Response, bodyPro
return
}
defer gz.Close()
- metadata, err = ioutil.ReadAll(gz)
+ metadata, err = io.ReadAll(gz)
if err != nil {
t.Fatal("Expected metadata to be valid")
return