achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#668] shard/test: Release shard in t.Cleanup()

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-09-06 17:18:04 +03:00 committed by Evgenii Stratonikov
parent 382eb8a485
commit 429f941cda
6 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/local_object_storage/shard/delete_test.go
View file

@ -28,7 +28,6 @@ func TestShard_Delete(t *testing.T) {
func testShardDelete(t *testing.T, hasWriteCache bool) { func testShardDelete(t *testing.T, hasWriteCache bool) {
sh := newShard(t, hasWriteCache) sh := newShard(t, hasWriteCache)
defer releaseShard(sh, t)
cnr := cidtest.ID() cnr := cidtest.ID()

1
pkg/local_object_storage/shard/get_test.go
View file

@ -32,7 +32,6 @@ func TestShard_Get(t *testing.T) {
func testShardGet(t *testing.T, hasWriteCache bool) { func testShardGet(t *testing.T, hasWriteCache bool) {
sh := newShard(t, hasWriteCache) sh := newShard(t, hasWriteCache)
defer releaseShard(sh, t)
var putPrm PutPrm var putPrm PutPrm
var getPrm GetPrm var getPrm GetPrm

1
pkg/local_object_storage/shard/head_test.go
View file

@ -30,7 +30,6 @@ func TestShard_Head(t *testing.T) {
func testShardHead(t *testing.T, hasWriteCache bool) { func testShardHead(t *testing.T, hasWriteCache bool) {
sh := newShard(t, hasWriteCache) sh := newShard(t, hasWriteCache)
defer releaseShard(sh, t)
var putPrm PutPrm var putPrm PutPrm
var headPrm HeadPrm var headPrm HeadPrm

1
pkg/local_object_storage/shard/inhume_test.go
View file

@ -27,7 +27,6 @@ func TestShard_Inhume(t *testing.T) {
func testShardInhume(t *testing.T, hasWriteCache bool) { func testShardInhume(t *testing.T, hasWriteCache bool) {
sh := newShard(t, hasWriteCache) sh := newShard(t, hasWriteCache)
defer releaseShard(sh, t)
cnr := cidtest.ID() cnr := cidtest.ID()

2
pkg/local_object_storage/shard/list_test.go
View file

@ -18,14 +18,12 @@ func TestShard_List(t *testing.T) {
t.Run("without write cache", func(t *testing.T) { t.Run("without write cache", func(t *testing.T) {
t.Parallel() t.Parallel()
sh := newShard(t, false) sh := newShard(t, false)
defer releaseShard(sh, t)
testShardList(t, sh) testShardList(t, sh)
}) })
t.Run("with write cache", func(t *testing.T) { t.Run("with write cache", func(t *testing.T) {
t.Parallel() t.Parallel()
shWC := newShard(t, true) shWC := newShard(t, true)
defer releaseShard(shWC, t)
testShardList(t, shWC) testShardList(t, shWC)
}) })
} }

4
pkg/local_object_storage/shard/shard_test.go
View file

@ -31,10 +31,12 @@ func (s epochState) CurrentEpoch() uint64 {
} }
func newShard(t testing.TB, enableWriteCache bool) *Shard { func newShard(t testing.TB, enableWriteCache bool) *Shard {
return newCustomShard(t, t.TempDir(), enableWriteCache, sh := newCustomShard(t, t.TempDir(), enableWriteCache,
writecacheconfig.Options{Type: writecacheconfig.TypeBBolt}, writecacheconfig.Options{Type: writecacheconfig.TypeBBolt},
nil, nil,
nil) nil)
t.Cleanup(func() { releaseShard(sh, t) })
return sh
} }
func newCustomShard(t testing.TB, rootPath string, enableWriteCache bool, wcOpts writecacheconfig.Options, bsOpts []blobstor.Option, metaOptions []meta.Option) *Shard { func newCustomShard(t testing.TB, rootPath string, enableWriteCache bool, wcOpts writecacheconfig.Options, bsOpts []blobstor.Option, metaOptions []meta.Option) *Shard {