mbiryukova/frostfs-http-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-http-gw
Code Pull requests Activity

[#219] Use zaptest.Logger

Browse source 
Use zaptest to get logs which get printed only if a test fails
or if you ran go test -v.

Dont use zaptest.Logger for fuzz otherwise ngfuzz/libfuzz crashes

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
Denis Kirillov 2025-02-21 16:11:01 +03:00
parent f9c5dc5260
commit a651b5823f
3 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/handler/handler_fuzz_test.go
View file

@ -21,6 +21,7 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
go_fuzz_utils "github.com/trailofbits/go-fuzz-utils" go_fuzz_utils "github.com/trailofbits/go-fuzz-utils"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"go.uber.org/zap"
) )
const ( const (
@ -125,7 +126,7 @@ func maybeFillRandom(tp *go_fuzz_utils.TypeProvider, initValue string) (string,
} }
func upload(tp *go_fuzz_utils.TypeProvider) (context.Context, *handlerContext, cid.ID, *fasthttp.RequestCtx, string, string, string, error) { func upload(tp *go_fuzz_utils.TypeProvider) (context.Context, *handlerContext, cid.ID, *fasthttp.RequestCtx, string, string, string, error) {
hc, err := prepareHandlerContext() hc, err := prepareHandlerContextBase(zap.NewExample())
if err != nil { if err != nil {
return nil, nil, cid.ID{}, nil, "", "", "", err return nil, nil, cid.ID{}, nil, "", "", "", err
} }

19
internal/handler/handler_test.go
View file

@ -30,6 +30,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zaptest"
) )
type treeServiceMock struct { type treeServiceMock struct {
@ -112,12 +113,13 @@ func (hc *handlerContext) Handler() *Handler {
return hc.h return hc.h
} }
func prepareHandlerContext() (*handlerContext, error) { func prepareHandlerContext(t *testing.T) *handlerContext {
logger, err := zap.NewDevelopment() hc, err := prepareHandlerContextBase(zaptest.NewLogger(t))
if err != nil { require.NoError(t, err)
return nil, err return hc
} }
func prepareHandlerContextBase(logger *zap.Logger) (*handlerContext, error) {
key, err := keys.NewPrivateKey() key, err := keys.NewPrivateKey()
if err != nil { if err != nil {
return nil, err return nil, err
@ -196,8 +198,7 @@ func (hc *handlerContext) prepareContainer(name string, basicACL acl.Basic) (cid
} }
func TestBasic(t *testing.T) { func TestBasic(t *testing.T) {
hc, err := prepareHandlerContext() hc := prepareHandlerContext(t)
require.NoError(t, err)
bktName := "bucket" bktName := "bucket"
cnrID, cnr, err := hc.prepareContainer(bktName, acl.PublicRWExtended) cnrID, cnr, err := hc.prepareContainer(bktName, acl.PublicRWExtended)
@ -279,8 +280,7 @@ func TestBasic(t *testing.T) {
} }
func TestFindObjectByAttribute(t *testing.T) { func TestFindObjectByAttribute(t *testing.T) {
hc, err := prepareHandlerContext() hc := prepareHandlerContext(t)
require.NoError(t, err)
hc.cfg.additionalSearch = true hc.cfg.additionalSearch = true
bktName := "bucket" bktName := "bucket"
@ -377,8 +377,7 @@ func TestFindObjectByAttribute(t *testing.T) {
} }
func TestNeedSearchByFileName(t *testing.T) { func TestNeedSearchByFileName(t *testing.T) {
hc, err := prepareHandlerContext() hc := prepareHandlerContext(t)
require.NoError(t, err)
for _, tc := range []struct { for _, tc := range []struct {
name string name string

14
internal/handler/multipart_test.go
View file

@ -60,12 +60,7 @@ func BenchmarkAll(b *testing.B) {
func defaultMultipart(filename string) error { func defaultMultipart(filename string) error {
r, bound := multipartFile(filename) r, bound := multipartFile(filename)
logger, err := zap.NewProduction() file, err := fetchMultipartFileDefault(zap.NewNop(), r, bound)
if err != nil {
return err
}
file, err := fetchMultipartFileDefault(logger, r, bound)
if err != nil { if err != nil {
return err return err
} }
@ -87,12 +82,7 @@ func TestName(t *testing.T) {
func customMultipart(filename string) error { func customMultipart(filename string) error {
r, bound := multipartFile(filename) r, bound := multipartFile(filename)
logger, err := zap.NewProduction() file, err := fetchMultipartFile(zap.NewNop(), r, bound)
if err != nil {
return err
}
file, err := fetchMultipartFile(logger, r, bound)
if err != nil { if err != nil {
return err return err
} }