github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 04:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replaced deprecated io/ioutil functions (#768)

Browse Source 
Signed-off-by: slab713 <109306207+slab713@users.noreply.github.com>
This commit is contained in:
slab713
2022-09-02 14:56:02 +02:00
committed by GitHub
parent 6ae793eb51
commit 8ffb053cec
36 changed files with 249 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/log/log_test.go
+16 -16
View File
@@ -8,7 +8,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path"
@@ -108,7 +108,7 @@ func TestAuditLogMessages(t *testing.T) {
So(resp, ShouldNotBeNil)
So(resp.StatusCode(), ShouldEqual, http.StatusOK)
byteValue, _ := ioutil.ReadAll(auditFile)
byteValue, _ := io.ReadAll(auditFile)
So(len(byteValue), ShouldEqual, 0)
})
@@ -120,13 +120,13 @@ func TestAuditLogMessages(t *testing.T) {
So(resp.StatusCode(), ShouldEqual, http.StatusAccepted)
// wait until the file is populated
byteValue, _ := ioutil.ReadAll(auditFile)
byteValue, _ := io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
var auditLog AuditLog
@@ -153,13 +153,13 @@ func TestAuditLogMessages(t *testing.T) {
So(location, ShouldNotBeEmpty)
// wait until the file is populated
byteValue, _ := ioutil.ReadAll(auditFile)
byteValue, _ := io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
var auditLog AuditLog
@@ -188,13 +188,13 @@ func TestAuditLogMessages(t *testing.T) {
So(resp.Header().Get(constants.DistContentDigestKey), ShouldNotBeEmpty)
// wait until the file is populated
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
err = json.Unmarshal(byteValue, &auditLog)
@@ -216,13 +216,13 @@ func TestAuditLogMessages(t *testing.T) {
So(resp.Header().Get("Content-Length"), ShouldEqual, "0")
// wait until the file is populated
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
err = json.Unmarshal(byteValue, &auditLog)
@@ -249,13 +249,13 @@ func TestAuditLogMessages(t *testing.T) {
So(location, ShouldNotBeEmpty)
// wait until the file is populated
byteValue, _ := ioutil.ReadAll(auditFile)
byteValue, _ := io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
var auditLog AuditLog
@@ -284,13 +284,13 @@ func TestAuditLogMessages(t *testing.T) {
So(resp.StatusCode(), ShouldEqual, http.StatusAccepted)
// wait until the file is populated
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
for {
if len(byteValue) != 0 {
break
}
time.Sleep(100 * time.Millisecond)
byteValue, _ = ioutil.ReadAll(auditFile)
byteValue, _ = io.ReadAll(auditFile)
}
err = json.Unmarshal(byteValue, &auditLog)
@@ -317,7 +317,7 @@ func TestLogErrors(t *testing.T) {
Convey("Get error when opening log file", t, func() {
dir := t.TempDir()
logPath := path.Join(dir, "logFile")
err := ioutil.WriteFile(logPath, []byte{}, 0o000)
err := os.WriteFile(logPath, []byte{}, 0o000)
So(err, ShouldBeNil)
So(func() {
_ = log.NewLogger(zerolog.DebugLevel.String(), logPath)
@@ -333,7 +333,7 @@ func TestNewAuditLogger(t *testing.T) {
Convey("Get error when opening audit file", t, func() {
dir := t.TempDir()
logPath := path.Join(dir, "logFile")
err := ioutil.WriteFile(logPath, []byte{}, 0o000)
err := os.WriteFile(logPath, []byte{}, 0o000)
So(err, ShouldBeNil)
So(func() {
_ = log.NewAuditLogger(zerolog.DebugLevel.String(), logPath)