use test utils in compact_test

pull/5805/head
Callum Styan 2017-12-06 16:30:24 -08:00
parent 945b6b01aa
commit fa26e2b6c3
1 changed files with 6 additions and 7 deletions

View File

@ -21,7 +21,6 @@ import (
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/stretchr/testify/require"
) )
func TestSplitByRange(t *testing.T) { func TestSplitByRange(t *testing.T) {
@ -123,7 +122,7 @@ func TestSplitByRange(t *testing.T) {
} }
} }
require.Equal(t, exp, splitByRange(blocks, c.trange)) Equals(t, exp, splitByRange(blocks, c.trange))
} }
} }
@ -147,7 +146,7 @@ func TestNoPanicFor0Tombstones(t *testing.T) {
} }
c, err := NewLeveledCompactor(nil, nil, []int64{50}, nil) c, err := NewLeveledCompactor(nil, nil, []int64{50}, nil)
require.NoError(t, err) Ok(t, err)
c.plan(metas) c.plan(metas)
} }
@ -160,7 +159,7 @@ func TestLeveledCompactor_plan(t *testing.T) {
720, 720,
2160, 2160,
}, nil) }, nil)
require.NoError(t, err) Ok(t, err)
cases := []struct { cases := []struct {
metas []dirMeta metas []dirMeta
@ -261,11 +260,11 @@ func TestLeveledCompactor_plan(t *testing.T) {
}, },
} }
for i, c := range cases { for _, c := range cases {
res, err := compactor.plan(c.metas) res, err := compactor.plan(c.metas)
require.NoError(t, err) Ok(t, err)
require.Equal(t, c.expected, res, "test case %d", i) Equals(t, c.expected, res)
} }
} }