From a979358bb2f791254fb094ddb2d161edcfe848a0 Mon Sep 17 00:00:00 2001
From: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:10:02 -0700
Subject: [PATCH] Update timers for go1.23 (#2663)

Do not read timer channel after call to Stop.
---
 assigner/core/assigner_test.go     | 31 +++++++-----------------------
 internal/registry/registry_test.go |  4 +---
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/assigner/core/assigner_test.go b/assigner/core/assigner_test.go
index b3ff671d9..66b66fe8a 100644
--- a/assigner/core/assigner_test.go
+++ b/assigner/core/assigner_test.go
@@ -141,9 +141,7 @@ func TestAssignerAll(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 0, assigns[0])
 
@@ -178,9 +176,7 @@ func TestAssignerAll(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	sort.Ints(assigns)
 	require.Equal(t, []int{0, 1}, assigns)
 
@@ -271,9 +267,7 @@ func TestAssignerOne(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 0, assigns[0])
 
@@ -306,9 +300,7 @@ func TestAssignerOne(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 1, assigns[0])
 
@@ -431,9 +423,7 @@ func TestAssignerPreferred(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 1, assigns[0], "expected assignment to indexer 1")
 
@@ -466,9 +456,7 @@ func TestAssignerPreferred(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 1, assigns[0], "expected assignment to indexer 1")
 
@@ -743,9 +731,7 @@ func TestFreezeHandoff(t *testing.T) {
 			t.Fatal("timed out waiting for assignment")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 	require.Equal(t, 1, len(assigns))
 	require.Equal(t, 0, assigns[0])
 
@@ -771,9 +757,6 @@ func TestFreezeHandoff(t *testing.T) {
 			t.Fatal("timed out waiting for handoff")
 		}
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
 
 	timeout.Reset(time.Second)
 	select {
diff --git a/internal/registry/registry_test.go b/internal/registry/registry_test.go
index f3114ab30..401882b5f 100644
--- a/internal/registry/registry_test.go
+++ b/internal/registry/registry_test.go
@@ -410,9 +410,7 @@ func TestPollProvider(t *testing.T) {
 	case <-timeout.C:
 		t.Fatal("Expected sync channel to be written")
 	}
-	if !timeout.Stop() {
-		<-timeout.C
-	}
+	timeout.Stop()
 
 	// Check that registry is not blocked by unread auto-sync channel.
 	poll.retryAfter = 0