realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#596] 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-20 17:26:42 +03:00
parent f8852c7626
commit 0fba02aadb
6 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/handler/handlers_test.go
View file

@ -35,6 +35,7 @@ import (
"github.com/panjf2000/ants/v2"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
"golang.org/x/exp/slices"
)
@ -158,7 +159,8 @@ func (c *configMock) putLocationConstraint(constraint string) {
}
func prepareHandlerContext(t *testing.T) *handlerContext {
hc, err := prepareHandlerContextBase(layer.DefaultCachesConfigs(zap.NewExample()))
log := zaptest.NewLogger(t)
hc, err := prepareHandlerContextBase(layer.DefaultCachesConfigs(log), log)
require.NoError(t, err)
return &handlerContext{
handlerContextBase: hc,
@ -167,7 +169,8 @@ func prepareHandlerContext(t *testing.T) *handlerContext {
}
func prepareHandlerContextWithMinCache(t *testing.T) *handlerContext {
hc, err := prepareHandlerContextBase(getMinCacheConfig(zap.NewExample()))
log := zaptest.NewLogger(t)
hc, err := prepareHandlerContextBase(getMinCacheConfig(log), log)
require.NoError(t, err)
return &handlerContext{
handlerContextBase: hc,
@ -175,13 +178,12 @@ func prepareHandlerContextWithMinCache(t *testing.T) *handlerContext {
}
}
func prepareHandlerContextBase(cacheCfg *layer.CachesConfig) (*handlerContextBase, error) {
func prepareHandlerContextBase(cacheCfg *layer.CachesConfig, log *zap.Logger) (*handlerContextBase, error) {
key, err := keys.NewPrivateKey()
if err != nil {
return nil, err
}
log := zap.NewExample()
tp := layer.NewTestFrostFS(key)
testResolver := &resolver.Resolver{Name: "test_resolver"}
@ -197,7 +199,7 @@ func prepareHandlerContextBase(cacheCfg *layer.CachesConfig) (*handlerContextBas
return nil, err
}
treeMock := tree.NewTree(memCli, zap.NewExample())
treeMock := tree.NewTree(memCli, log)
features := &layer.FeatureSettingsMock{}