Fix tests

Signed-off-by: Arve Knudsen <[email protected]>

pkg/ingester/client/buffering_client_test.go

@@ -265,16 +265,24 @@ func (ms *mockServer) Push(_ context.Context, r *mimirpb.WriteRequest) (*mimirpb
 	ms.mu.Lock()
 	defer ms.mu.Unlock()
 
-	// Clear unmarshal data. We don't need it and it breaks equality check in test.
-	r.ClearTimeseriesUnmarshalData()
-	ms.reqs = append(ms.reqs, r)
+	d, err := r.Marshal()
+	if err != nil {
+		return nil, fmt.Errorf("marshal WriteRequest: %w", err)
+	}
+	var c mimirpb.WriteRequest
+	if err := c.Unmarshal(d); err != nil {
+		return nil, fmt.Errorf("unmarshal WriteRequest: %w", err)
+	}
+	// Clear unmarshal data, to ensure equality.
+	c.ClearTimeseriesUnmarshalData()
+	ms.reqs = append(ms.reqs, &c)
 
 	if ms.trackSamples {
 		if ms.samplesPerSeries == nil {
 			ms.samplesPerSeries = map[string][]mimirpb.Sample{}
 		}
 
-		for _, ts := range r.Timeseries {
+		for _, ts := range c.Timeseries {
 			ser := mimirpb.FromLabelAdaptersToLabels(ts.Labels).String()
 			ms.samplesPerSeries[ser] = append(ms.samplesPerSeries[ser], ts.Samples...)
 		}