mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-06 14:17:12 +02:00
Code Issues Projects Releases Wiki Activity

Move unit test to existing suite

Browse Source 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
This commit is contained in:
Jeanette Tan 2025-04-16 03:57:42 +08:00
parent f1b6694837
commit ab2d17d7a0
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
storage/remote/client_test.go
View File

@ -225,6 +225,7 @@ func TestReadClient(t *testing.T) {
expectedSamples [][]model.SamplePair expectedSamples [][]model.SamplePair
expectedErrorContains string expectedErrorContains string
sortSeries bool sortSeries bool
unwrap bool
}{ }{
{ {
name: "sorted sampled response", name: "sorted sampled response",
@ -336,6 +337,14 @@ func TestReadClient(t *testing.T) {
timeout: 5 * time.Millisecond, timeout: 5 * time.Millisecond,
expectedErrorContains: "context deadline exceeded: request timed out after 5ms", 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 { for _, test := range tests {
@ -366,6 +375,10 @@ func TestReadClient(t *testing.T) {
ss, err := c.Read(context.Background(), query, test.sortSeries) ss, err := c.Read(context.Background(), query, test.sortSeries)
if test.expectedErrorContains != "" { if test.expectedErrorContains != "" {
require.ErrorContains(t, err, test.expectedErrorContains) require.ErrorContains(t, err, test.expectedErrorContains)
if test.unwrap {
err = errors.Unwrap(err)
require.EqualError(t, err, test.expectedErrorContains+"\n")
}
return 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 { func sampledResponseHTTPHandler(t *testing.T) http.HandlerFunc {
return func(w http.ResponseWriter, _ *http.Request) { return func(w http.ResponseWriter, _ *http.Request) {
w.Header().Set("Content-Type", "application/x-protobuf") w.Header().Set("Content-Type", "application/x-protobuf")