@@ -1083,7 +1083,7 @@ func TestCompactor_ShouldSkipOutOrOrderBlocks(t *testing.T) {
1083
1083
cfg .SkipBlocksWithOutOfOrderChunksEnabled = true
1084
1084
c , tsdbCompac , tsdbPlanner , _ , registry := prepare (t , cfg , bucketClient , nil )
1085
1085
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 )
1087
1087
1088
1088
tsdbPlanner .On ("Plan" , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]* metadata.Meta {
1089
1089
{
@@ -1986,7 +1986,7 @@ func TestCompactor_ShouldNotTreatInterruptionsAsErrors(t *testing.T) {
1986
1986
c , tsdbCompactor , tsdbPlanner , logs , registry := prepare (t , prepareConfig (), bucketClient , nil )
1987
1987
1988
1988
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 ) {
1990
1990
cancel ()
1991
1991
})
1992
1992
tsdbPlanner .On ("Plan" , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]* metadata.Meta {
0 commit comments