Remove middleware-specific wrap() call, since this is no longer middl…

…eware
grafana · Sep 27, 2024 · a5cf36a · a5cf36a
1 parent 92c756d
commit a5cf36a
Showing 1 changed file with 5 additions and 20 deletions.
diff --git a/pkg/querier/queryrange/detected_fields_test.go b/pkg/querier/queryrange/detected_fields_test.go
@@ -1028,10 +1028,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
 			limitedHandler(mockLogfmtStreamWithLabels(1, 5, `{type="test", name="foo"}`)),
 			logHandler(mockLogfmtStreamWithLabels(1, 5, `{type="test", name="foo"}`)),
 			limits,
-		).Wrap(base.HandlerFunc(func(_ context.Context, _ base.Request) (base.Response, error) {
-			t.Fatal("should not be called")
-			return nil, nil
-		}))
+		)
 
 		detectedFields := handleRequest(handler, request)
 		// log lines come from querier_mock_test.go
@@ -1058,10 +1055,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
 			limitedHandler(mockLogfmtStreamWithLabelsAndStructuredMetadata(1, 5, `{type="test", name="bob"}`)),
 			logHandler(mockLogfmtStreamWithLabelsAndStructuredMetadata(1, 5, `{type="test", name="bob"}`)),
 			limits,
-		).Wrap(base.HandlerFunc(func(_ context.Context, _ base.Request) (base.Response, error) {
-			t.Fatal("should not be called")
-			return nil, nil
-		}))
+		)
 
 		detectedFields := handleRequest(handler, request)
 		// log lines come from querier_mock_test.go
@@ -1090,10 +1084,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
 			limitedHandler(mockLogfmtStreamWithLabels(1, 2, `{type="test", name="foo"}`)),
 			logHandler(mockLogfmtStreamWithLabels(1, 2, `{type="test", name="foo"}`)),
 			limits,
-		).Wrap(base.HandlerFunc(func(_ context.Context, _ base.Request) (base.Response, error) {
-			t.Fatal("should not be called")
-			return nil, nil
-		}))
+		)
 
 		detectedFields := handleRequest(handler, request)
 		// log lines come from querier_mock_test.go
@@ -1136,10 +1127,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
 				),
 				logHandler(mockLogfmtStreamWithLabelsAndStructuredMetadata(1, 2, `{type="test"}`)),
 				limits,
-			).Wrap(base.HandlerFunc(func(_ context.Context, _ base.Request) (base.Response, error) {
-				t.Fatal("should not be called")
-				return nil, nil
-			}))
+			)
 
 			detectedFields := handleRequest(handler, request)
 			// log lines come from querier_mock_test.go
@@ -1188,10 +1176,7 @@ func TestQuerier_DetectedFields(t *testing.T) {
 				),
 				logHandler(mockLogfmtStreamWithLabelsAndStructuredMetadata(1, 2, `{type="test", name="bob"}`)),
 				limits,
-			).Wrap(base.HandlerFunc(func(_ context.Context, _ base.Request) (base.Response, error) {
-				t.Fatal("should not be called")
-				return nil, nil
-			}))
+			)
 
 			detectedFields := handleRequest(handler, request)
 			// log lines come from querier_mock_test.go