update test, simplify

Signed-off-by: Tim Vaillancourt <[email protected]>
vitessio · Feb 28, 2025 · 3e1c925 · 3e1c925
1 parent 6e9291e
commit 3e1c925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/go/vt/vtorc/discovery/queue.go b/go/vt/vtorc/discovery/queue.go
@@ -60,9 +60,8 @@ func (q *Queue) setKeyCheckEnqueued(key string) (alreadyEnqueued bool) {
 	q.mu.Lock()
 	defer q.mu.Unlock()
 
-	if _, found := q.enqueued[key]; found {
-		alreadyEnqueued = true
-	} else {
+	_, alreadyEnqueued = q.enqueued[key]
+	if !alreadyEnqueued {
 		q.enqueued[key] = struct{}{}
 	}
 	return alreadyEnqueued

diff --git a/go/vt/vtorc/discovery/queue_test.go b/go/vt/vtorc/discovery/queue_test.go
@@ -29,17 +29,17 @@ func TestQueue(t *testing.T) {
 
 	// Push
 	q.Push(t.Name())
-	require.Equal(t, 1, q.QueueLen())
+	require.Equal(t, 2, q.QueueLen())
 	_, found := q.enqueued[t.Name()]
 	require.True(t, found)
 
 	// Push duplicate
 	q.Push(t.Name())
-	require.Equal(t, 1, q.QueueLen())
+	require.Equal(t, 2, q.QueueLen())
 
 	// Consume
 	require.Equal(t, t.Name(), q.Consume())
-	require.Zero(t, q.QueueLen())
+	require.Equal(t, 1, q.QueueLen())
 	_, found = q.enqueued[t.Name()]
 	require.True(t, found)