Skip to content

Commit 1ba4bca

Browse files
authored
Fixed incorrect return value for mocked function (#6080)
Signed-off-by: Alex Le <[email protected]>
1 parent 527d25f commit 1ba4bca

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkg/compactor/compactor_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ func TestCompactor_ShouldSkipOutOrOrderBlocks(t *testing.T) {
10831083
cfg.SkipBlocksWithOutOfOrderChunksEnabled = true
10841084
c, tsdbCompac, tsdbPlanner, _, registry := prepare(t, cfg, bucketClient, nil)
10851085

1086-
tsdbCompac.On("CompactWithBlockPopulator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(b1, nil)
1086+
tsdbCompac.On("CompactWithBlockPopulator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]ulid.ULID{b1}, nil)
10871087

10881088
tsdbPlanner.On("Plan", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*metadata.Meta{
10891089
{
@@ -1986,7 +1986,7 @@ func TestCompactor_ShouldNotTreatInterruptionsAsErrors(t *testing.T) {
19861986
c, tsdbCompactor, tsdbPlanner, logs, registry := prepare(t, prepareConfig(), bucketClient, nil)
19871987

19881988
ctx, cancel := context.WithCancel(context.Background())
1989-
tsdbCompactor.On("CompactWithBlockPopulator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(ulid.ULID{}, context.Canceled).Run(func(args mock.Arguments) {
1989+
tsdbCompactor.On("CompactWithBlockPopulator", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]ulid.ULID{}, context.Canceled).Run(func(args mock.Arguments) {
19901990
cancel()
19911991
})
19921992
tsdbPlanner.On("Plan", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*metadata.Meta{

0 commit comments

Comments
 (0)