tsdb tests: restrict some 'defer' operations

'defer' only runs at the end of the function, so introduce some more
functions / move the start, so that 'defer' can run at the end of the
logical block.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

tsdb/db_test.go

@@ -426,8 +426,8 @@ func TestDeleteSimple(t *testing.T) {
 		},
 	}
 
-Outer:
 	for _, c := range cases {
+		t.Run("", func(t *testing.T) {
 			db := openTestDB(t, nil, nil)
 			defer func() {
 				require.NoError(t, db.Close())
@@ -471,7 +471,7 @@ Outer:
 
 				if !eok {
 					require.Empty(t, res.Warnings())
-				continue Outer
+					break
 				}
 				sexp := expss.At()
 				sres := res.At()
@@ -484,6 +484,7 @@ Outer:
 				require.Equal(t, errExp, errRes)
 				require.Equal(t, smplExp, smplRes)
 			}
+		})
 	}
 }
 
@@ -759,8 +760,8 @@ func TestDB_SnapshotWithDelete(t *testing.T) {
 		},
 	}
 
-Outer:
 	for _, c := range cases {
+		t.Run("", func(t *testing.T) {
 			// TODO(gouthamve): Reset the tombstones somehow.
 			// Delete the ranges.
 			for _, r := range c.intervals {
@@ -795,7 +796,7 @@ Outer:
 
 			if len(expSamples) == 0 {
 				require.False(t, res.Next())
-			continue
+				return
 			}
 
 			for {
@@ -804,7 +805,7 @@ Outer:
 
 				if !eok {
 					require.Empty(t, res.Warnings())
-				continue Outer
+					break
 				}
 				sexp := expss.At()
 				sres := res.At()
@@ -817,6 +818,7 @@ Outer:
 				require.Equal(t, errExp, errRes)
 				require.Equal(t, smplExp, smplRes)
 			}
+		})
 	}
 }
 
@@ -2250,6 +2252,7 @@ func TestDB_LabelNames(t *testing.T) {
 		require.NoError(t, err)
 	}
 	for _, tst := range tests {
+		t.Run("", func(t *testing.T) {
 			ctx := context.Background()
 			db := openTestDB(t, nil, nil)
 			defer func() {
@@ -2293,6 +2296,7 @@ func TestDB_LabelNames(t *testing.T) {
 			require.Empty(t, ws)
 			require.NoError(t, q.Close())
 			require.Equal(t, tst.exp2, labelNames)
+		})
 	}
 }
 

tsdb/querier_test.go

@@ -2633,6 +2633,8 @@ func BenchmarkSetMatcher(b *testing.B) {
 	}
 
 	for _, c := range cases {
+		benchMsg := fmt.Sprintf("nSeries=%d,nBlocks=%d,cardinality=%d,pattern=\"%s\"", c.numSeries, c.numBlocks, c.cardinality, c.pattern)
+		b.Run(benchMsg, func(b *testing.B) {
 			dir := b.TempDir()
 
 			var (
@@ -2667,8 +2669,6 @@ func BenchmarkSetMatcher(b *testing.B) {
 			sq := storage.NewMergeQuerier(qblocks, nil, storage.ChainedSeriesMerge)
 			defer sq.Close()
 
-		benchMsg := fmt.Sprintf("nSeries=%d,nBlocks=%d,cardinality=%d,pattern=\"%s\"", c.numSeries, c.numBlocks, c.cardinality, c.pattern)
-		b.Run(benchMsg, func(b *testing.B) {
 			b.ResetTimer()
 			b.ReportAllocs()
 			for n := 0; n < b.N; n++ {