From ab2d17d7a01e9ebe7eb2b655c2ec3921c76143d8 Mon Sep 17 00:00:00 2001
From: Jeanette Tan <jeanette.tan@grafana.com>
Date: Wed, 16 Apr 2025 03:57:42 +0800
Subject: [PATCH] Move unit test to existing suite

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
---
 storage/remote/client_test.go | 41 +++++++++++------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/storage/remote/client_test.go b/storage/remote/client_test.go
index 2ed825d6d5..39e0dd9402 100644
--- a/storage/remote/client_test.go
+++ b/storage/remote/client_test.go
@@ -225,6 +225,7 @@ func TestReadClient(t *testing.T) {
 		expectedSamples       [][]model.SamplePair
 		expectedErrorContains string
 		sortSeries            bool
+		unwrap                bool
 	}{
 		{
 			name:        "sorted sampled response",
@@ -336,6 +337,14 @@ func TestReadClient(t *testing.T) {
 			timeout:               5 * time.Millisecond,
 			expectedErrorContains: "context deadline exceeded: request timed out after 5ms",
 		},
+		{
+			name: "unwrap error",
+			httpHandler: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+				http.Error(w, "test error", http.StatusBadRequest)
+			}),
+			expectedErrorContains: "test error",
+			unwrap:                true,
+		},
 	}
 
 	for _, test := range tests {
@@ -366,6 +375,10 @@ func TestReadClient(t *testing.T) {
 			ss, err := c.Read(context.Background(), query, test.sortSeries)
 			if test.expectedErrorContains != "" {
 				require.ErrorContains(t, err, test.expectedErrorContains)
+				if test.unwrap {
+					err = errors.Unwrap(err)
+					require.EqualError(t, err, test.expectedErrorContains+"\n")
+				}
 				return
 			}
 
@@ -409,34 +422,6 @@ func TestReadClient(t *testing.T) {
 	}
 }
 
-func TestReadClientUnwrapError(t *testing.T) {
-	httpHandler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		http.Error(w, "test error", http.StatusBadRequest)
-	})
-	expectedError := "test error\n"
-
-	server := httptest.NewServer(httpHandler)
-	defer server.Close()
-
-	u, err := url.Parse(server.URL)
-	require.NoError(t, err)
-
-	conf := &ClientConfig{
-		URL:              &config_util.URL{URL: u},
-		Timeout:          model.Duration(5 * time.Second),
-		ChunkedReadLimit: config.DefaultChunkedReadLimit,
-	}
-	c, err := NewReadClient("test", conf)
-	require.NoError(t, err)
-
-	query := &prompb.Query{}
-
-	_, err = c.Read(context.Background(), query, false)
-	require.ErrorContains(t, err, expectedError)
-	err = errors.Unwrap(err)
-	require.EqualError(t, err, expectedError)
-}
-
 func sampledResponseHTTPHandler(t *testing.T) http.HandlerFunc {
 	return func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/x-protobuf")