Disable parallel tests when thanos engine is enabled (#5298)

* this pr disables parallel tests when thanos engine is enabled

Signed-off-by: Ben Ye <[email protected]>

* fix lint

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

pkg/querier/blocks_store_queryable_test.go

@@ -1336,7 +1336,6 @@ func TestBlocksStoreQuerier_SelectSortedShouldHonorQueryStoreAfter(t *testing.T)
 }
 
 func TestBlocksStoreQuerier_PromQLExecution(t *testing.T) {
-	t.Parallel()
 	logger := log.NewNopLogger()
 	opts := promql.EngineOpts{
 		Logger:     logger,
@@ -1368,10 +1367,6 @@ func TestBlocksStoreQuerier_PromQLExecution(t *testing.T) {
 	}
 	for _, thanosEngine := range []bool{false, true} {
 		t.Run(fmt.Sprintf("thanos engine enabled=%t", thanosEngine), func(t *testing.T) {
-			if !thanosEngine {
-				//parallel testing for non thanos engine
-				t.Parallel()
-			}
 			var queryEngine v1.QueryEngine
 			if thanosEngine {
 				queryEngine = engine.New(engine.Opts{

pkg/querier/chunk_store_queryable_test.go

@@ -24,8 +24,6 @@ import (
 var _ SeriesWithChunks = &chunkSeries{}
 
 func TestChunkQueryable(t *testing.T) {
-	t.Parallel()
-
 	opts := promql.EngineOpts{
 		Logger:             log.NewNopLogger(),
 		ActiveQueryTracker: promql.NewActiveQueryTracker(t.TempDir(), 10, log.NewNopLogger()),
@@ -37,7 +35,6 @@ func TestChunkQueryable(t *testing.T) {
 			for _, encoding := range encodings {
 				for _, query := range queries {
 					t.Run(fmt.Sprintf("%s/%s/%s/ thanos engine enabled = %t", testcase.name, encoding.name, query.query, thanosEngine), func(t *testing.T) {
-						//parallel testing causes data race
 						var queryEngine v1.QueryEngine
 						if thanosEngine {
 							queryEngine = engine.New(engine.Opts{

pkg/querier/error_translate_queryable_test.go

@@ -19,16 +19,14 @@ import (
 	"github.com/prometheus/prometheus/storage"
 	v1 "github.com/prometheus/prometheus/web/api/v1"
 	"github.com/stretchr/testify/require"
-	"github.com/thanos-community/promql-engine/engine"
-	"github.com/thanos-community/promql-engine/logicalplan"
 	"github.com/weaveworks/common/httpgrpc"
 	"github.com/weaveworks/common/user"
 
 	"github.com/cortexproject/cortex/pkg/util/validation"
 )
 
 func TestApiStatusCodes(t *testing.T) {
-	//parallel testing causes data race
+	t.Parallel()
 
 	for ix, tc := range []struct {
 		err            error
@@ -104,41 +102,31 @@ func TestApiStatusCodes(t *testing.T) {
 			expectedCode:   422,
 		},
 	} {
-		for _, thanosEngine := range []bool{false, true} {
-			for k, q := range map[string]storage.SampleAndChunkQueryable{
-				"error from queryable": errorTestQueryable{err: tc.err},
-				"error from querier":   errorTestQueryable{q: errorTestQuerier{err: tc.err}},
-				"error from seriesset": errorTestQueryable{q: errorTestQuerier{s: errorTestSeriesSet{err: tc.err}}},
-			} {
-				t.Run(fmt.Sprintf("%s/%d", k, ix), func(t *testing.T) {
-					opts := promql.EngineOpts{
-						Logger:             log.NewNopLogger(),
-						Reg:                nil,
-						ActiveQueryTracker: nil,
-						MaxSamples:         100,
-						Timeout:            5 * time.Second,
-					}
-					var queryEngine v1.QueryEngine
-					if thanosEngine {
-						queryEngine = engine.New(engine.Opts{
-							EngineOpts:        opts,
-							LogicalOptimizers: logicalplan.AllOptimizers,
-						})
-					} else {
-						queryEngine = promql.NewEngine(opts)
-					}
-					r := createPrometheusAPI(NewErrorTranslateSampleAndChunkQueryable(q), queryEngine)
-					rec := httptest.NewRecorder()
-
-					req := httptest.NewRequest("GET", "/api/v1/query?query=up", nil)
-					req = req.WithContext(user.InjectOrgID(context.Background(), "test org"))
-
-					r.ServeHTTP(rec, req)
-
-					require.Equal(t, tc.expectedCode, rec.Code)
-					require.Contains(t, rec.Body.String(), tc.expectedString)
-				})
-			}
+		for k, q := range map[string]storage.SampleAndChunkQueryable{
+			"error from queryable": errorTestQueryable{err: tc.err},
+			"error from querier":   errorTestQueryable{q: errorTestQuerier{err: tc.err}},
+			"error from seriesset": errorTestQueryable{q: errorTestQuerier{s: errorTestSeriesSet{err: tc.err}}},
+		} {
+			t.Run(fmt.Sprintf("%s/%d", k, ix), func(t *testing.T) {
+				opts := promql.EngineOpts{
+					Logger:             log.NewNopLogger(),
+					Reg:                nil,
+					ActiveQueryTracker: nil,
+					MaxSamples:         100,
+					Timeout:            5 * time.Second,
+				}
+				queryEngine := promql.NewEngine(opts)
+				r := createPrometheusAPI(NewErrorTranslateSampleAndChunkQueryable(q), queryEngine)
+				rec := httptest.NewRecorder()
+
+				req := httptest.NewRequest("GET", "/api/v1/query?query=up", nil)
+				req = req.WithContext(user.InjectOrgID(context.Background(), "test org"))
+
+				r.ServeHTTP(rec, req)
+
+				require.Equal(t, tc.expectedCode, rec.Code)
+				require.Contains(t, rec.Body.String(), tc.expectedString)
+			})
 		}
 	}
 }