fix test which hangs sometimes

alicebob · Nov 6, 2022 · 16bd87e · 16bd87e
1 parent 6f4cd66
commit 16bd87e
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/cmd_stream_test.go b/cmd_stream_test.go
@@ -1,6 +1,7 @@
 package miniredis
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"regexp"
@@ -421,29 +422,36 @@ func TestStreamRead(t *testing.T) {
 
 		t.Run("blocking async", func(t *testing.T) {
 			// XREAD blocking test using latest ID
+			ctx, cancel := context.WithCancel(context.Background())
 			var wg sync.WaitGroup
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
-				mustDo(t, c,
-					"XREAD", "BLOCK", "0", "STREAMS", "planets", "$",
-					proto.Array(
-						proto.Array(proto.String("planets"),
-							proto.Array(
-								proto.Array(proto.String("5-1"), proto.Strings("name", "block", "idx", "6")),
-							),
-						),
-					),
-				)
+				xaddClient, err := proto.Dial(s.Addr())
+				ok(t, err)
+				defer xaddClient.Close()
+				for {
+					select {
+					case <-time.After(10 * time.Millisecond):
+					case <-ctx.Done():
+						return
+					}
+					_, err = xaddClient.Do("XADD", "planets", "5-1", "name", "block", "idx", "6")
+					ok(t, err)
+				}
 			}()
 
-			// Wait for the blocking XREAD to start and then run XADD
-			xaddClient, err := proto.Dial(s.Addr())
-			ok(t, err)
-			defer xaddClient.Close()
-
-			_, err = xaddClient.Do("XADD", "planets", "5-1", "name", "block", "idx", "6")
-			ok(t, err)
+			mustDo(t, c,
+				"XREAD", "BLOCK", "0", "STREAMS", "planets", "$",
+				proto.Array(
+					proto.Array(proto.String("planets"),
+						proto.Array(
+							proto.Array(proto.String("5-1"), proto.Strings("name", "block", "idx", "6")),
+						),
+					),
+				),
+			)
+			cancel()
 			wg.Wait()
 		})
 	})