From 9688e0439ae9b744ccd672a206f41a0edcccda17 Mon Sep 17 00:00:00 2001
From: Alan Protasio <alanprot@gmail.com>
Date: Thu, 5 Jan 2023 17:41:16 -0800
Subject: [PATCH] Fix AM breaking change

Signed-off-by: Alan Protasio <alanprot@gmail.com>
---
 pkg/alertmanager/alertmanager_http_test.go | 2 +-
 pkg/storegateway/gateway_test.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/alertmanager/alertmanager_http_test.go b/pkg/alertmanager/alertmanager_http_test.go
index d7bdb50805..d34049a6b2 100644
--- a/pkg/alertmanager/alertmanager_http_test.go
+++ b/pkg/alertmanager/alertmanager_http_test.go
@@ -29,7 +29,7 @@ func TestMultitenantAlertmanager_GetStatusHandler(t *testing.T) {
 				true,
 				cluster.DefaultPushPullInterval,
 				cluster.DefaultGossipInterval,
-				cluster.DefaultTcpTimeout,
+				cluster.DefaultTCPTimeout,
 				cluster.DefaultProbeTimeout,
 				cluster.DefaultProbeInterval,
 				nil,
diff --git a/pkg/storegateway/gateway_test.go b/pkg/storegateway/gateway_test.go
index 985e2ef295..d62ce22981 100644
--- a/pkg/storegateway/gateway_test.go
+++ b/pkg/storegateway/gateway_test.go
@@ -1144,7 +1144,7 @@ func readSamplesFromChunks(rawChunks []storepb.AggrChunk) ([]sample, error) {
 		}
 
 		it := c.Iterator(nil)
-		for it.Next() {
+		for it.Next() != chunkenc.ValNone {
 			if it.Err() != nil {
 				return nil, it.Err()
 			}