From 1e60f02066eda9485da3174afd9a139899a6871c Mon Sep 17 00:00:00 2001 From: Bartek Plotka Date: Wed, 28 Mar 2018 23:19:22 +0100 Subject: [PATCH] db: Simplified tests. Signed-off-by: Bartek Plotka --- db_test.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/db_test.go b/db_test.go index 7768a4130..be0fba462 100644 --- a/db_test.go +++ b/db_test.go @@ -21,7 +21,6 @@ import ( "sort" "testing" - "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/tsdb/labels" "github.com/prometheus/tsdb/testutil" @@ -895,17 +894,11 @@ func expandSeriesSet(ss SeriesSet) ([]labels.Labels, error) { } func TestOverlappingBlocksDetectsAllOverlaps(t *testing.T) { - u := uint64(0) - newULID := func() ulid.ULID { - u++ - return ulid.MustNew(u, nil) - } - // Create 10 blocks that does not overlap (0-10, 10-20, ..., 100-110) but in reverse order to ensure our algorithm // will handle that. var metas = make([]BlockMeta, 11) for i := 10; i >= 0; i-- { - metas[i] = BlockMeta{MinTime: int64(i * 10), MaxTime: int64((i + 1) * 10), ULID: newULID()} + metas[i] = BlockMeta{MinTime: int64(i * 10), MaxTime: int64((i + 1) * 10)} } testutil.Assert(t, len(OverlappingBlocks(metas)) == 0, "we found unexpected overlaps") @@ -913,28 +906,28 @@ func TestOverlappingBlocksDetectsAllOverlaps(t *testing.T) { // Add overlapping blocks. // o1 overlaps with 10-20. - o1 := BlockMeta{MinTime: 15, MaxTime: 17, ULID: newULID()} + o1 := BlockMeta{MinTime: 15, MaxTime: 17} testutil.Equals(t, [][]BlockMeta{{metas[1], o1}}, OverlappingBlocks(append(metas, o1))) // o2 overlaps with 20-30 and 30-40. - o2 := BlockMeta{MinTime: 21, MaxTime: 31, ULID: newULID()} + o2 := BlockMeta{MinTime: 21, MaxTime: 31} testutil.Equals(t, [][]BlockMeta{{metas[2], o2}, {o2, metas[3]}}, OverlappingBlocks(append(metas, o2))) // o3a and o3b overlaps with 30-40 and each other. - o3a := BlockMeta{MinTime: 33, MaxTime: 39, ULID: newULID()} - o3b := BlockMeta{MinTime: 34, MaxTime: 36, ULID: newULID()} + o3a := BlockMeta{MinTime: 33, MaxTime: 39} + o3b := BlockMeta{MinTime: 34, MaxTime: 36} testutil.Equals(t, [][]BlockMeta{{metas[3], o3a, o3b}}, OverlappingBlocks(append(metas, o3a, o3b))) // o4 is 1:1 overlap with 50-60. - o4 := BlockMeta{MinTime: 50, MaxTime: 60, ULID: newULID()} + o4 := BlockMeta{MinTime: 50, MaxTime: 60} testutil.Equals(t, [][]BlockMeta{{metas[5], o4}}, OverlappingBlocks(append(metas, o4))) // o5 overlaps with 60-70, 70-80 and 80-90. - o5 := BlockMeta{MinTime: 61, MaxTime: 85, ULID: newULID()} + o5 := BlockMeta{MinTime: 61, MaxTime: 85} testutil.Equals(t, [][]BlockMeta{{metas[6], o5}, {o5, metas[7]}, {o5, metas[8]}}, OverlappingBlocks(append(metas, o5))) // o6a overlaps with 90-100, 100-110 and o6b, o6b overlaps with 90-100 and o6a. - o6a := BlockMeta{MinTime: 92, MaxTime: 105, ULID: newULID()} - o6b := BlockMeta{MinTime: 94, MaxTime: 99, ULID: newULID()} + o6a := BlockMeta{MinTime: 92, MaxTime: 105} + o6b := BlockMeta{MinTime: 94, MaxTime: 99} testutil.Equals(t, [][]BlockMeta{{metas[9], o6a, o6b}, {o6a, metas[10]}}, OverlappingBlocks(append(metas, o6a, o6b))) }