From 6fdc8528139dd908c1d2cfea738c36262e7bd8c3 Mon Sep 17 00:00:00 2001 From: Ganesh Vernekar <15064823+codesome@users.noreply.github.com> Date: Mon, 23 Mar 2020 20:25:25 +0530 Subject: [PATCH] Fix TestHeadDeleteSimple to test reloaded Head too (#7021) Signed-off-by: Ganesh Vernekar --- tsdb/head_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tsdb/head_test.go b/tsdb/head_test.go index 57e5c3a92..234745c15 100644 --- a/tsdb/head_test.go +++ b/tsdb/head_test.go @@ -505,7 +505,6 @@ func TestHeadDeleteSimple(t *testing.T) { for _, compress := range []bool{false, true} { t.Run(fmt.Sprintf("compress=%t", compress), func(t *testing.T) { - Outer: for _, c := range cases { dir, err := ioutil.TempDir("", "test_wal_reload") testutil.Ok(t, err) @@ -553,22 +552,23 @@ func TestHeadDeleteSimple(t *testing.T) { testutil.Ok(t, reloadedHead.Init(0)) // Compare the query results for both heads - before and after the reload. - expSeriesSet := newMockSeriesSet([]storage.Series{ - newSeries(map[string]string{lblDefault.Name: lblDefault.Value}, func() []tsdbutil.Sample { - ss := make([]tsdbutil.Sample, 0, len(c.smplsExp)) - for _, s := range c.smplsExp { - ss = append(ss, s) - } - return ss - }(), - ), - }) + Outer: for _, h := range []*Head{head, reloadedHead} { q, err := NewBlockQuerier(h, h.MinTime(), h.MaxTime()) testutil.Ok(t, err) actSeriesSet, ws, err := q.Select(false, nil, labels.MustNewMatcher(labels.MatchEqual, lblDefault.Name, lblDefault.Value)) testutil.Ok(t, err) testutil.Equals(t, 0, len(ws)) + expSeriesSet := newMockSeriesSet([]storage.Series{ + newSeries(map[string]string{lblDefault.Name: lblDefault.Value}, func() []tsdbutil.Sample { + ss := make([]tsdbutil.Sample, 0, len(c.smplsExp)) + for _, s := range c.smplsExp { + ss = append(ss, s) + } + return ss + }(), + ), + }) for { eok, rok := expSeriesSet.Next(), actSeriesSet.Next()