test: rueidisotel with the Arbitrary command builder

redis · Jan 29, 2024 · a171bb7 · a171bb7
1 parent ffeb7c7
commit a171bb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/rueidisotel/go.sum b/rueidisotel/go.sum
@@ -7,8 +7,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/redis/rueidis v1.0.27 h1:UhTlj+9JBuQe6SHe60YJA+0TonZDi5n/TkJZ7QTyV/s=
-github.com/redis/rueidis v1.0.27/go.mod h1:NT7lPuiVYijdZVsV0V8i9ZUhqe1OMGaq+NiQigNuKlg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
 go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=

diff --git a/rueidisotel/trace_test.go b/rueidisotel/trace_test.go
@@ -15,7 +15,6 @@ import (
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 
 	"github.com/redis/rueidis"
-	"github.com/redis/rueidis/internal/cmds"
 )
 
 // MockMeterProvider for testing purposes
@@ -151,10 +150,10 @@ func testWithClient(t *testing.T, client rueidis.Client, exp *tracetest.InMemory
 		)
 		validateTrace(t, exp, "SET SET SET SET SET", codes.Ok)
 
-		client.Do(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+		client.Do(ctx, client.B().Arbitrary("unknown", "command").Build())
 		validateTrace(t, exp, "unknown", codes.Error)
 
-		client.DoMulti(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+		client.DoMulti(ctx, client.B().Arbitrary("unknown", "command").Build())
 		validateTrace(t, exp, "unknown", codes.Error)
 
 		ctx2, cancel := context.WithTimeout(ctx, time.Second/2)
@@ -186,10 +185,10 @@ func testWithClient(t *testing.T, client rueidis.Client, exp *tracetest.InMemory
 		)
 		validateTrace(t, exp, "SET SET SET SET SET", codes.Ok)
 
-		c.Do(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+		c.Do(ctx, client.B().Arbitrary("unknown", "command").Build())
 		validateTrace(t, exp, "unknown", codes.Error)
 
-		c.DoMulti(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+		c.DoMulti(ctx, client.B().Arbitrary("unknown", "command").Build())
 		validateTrace(t, exp, "unknown", codes.Error)
 
 		ctx2, cancel := context.WithTimeout(ctx, time.Second/2)
@@ -204,10 +203,10 @@ func testWithClient(t *testing.T, client rueidis.Client, exp *tracetest.InMemory
 	cancel()
 	<-hookCh
 
-	client.Do(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+	client.Do(ctx, client.B().Arbitrary("unknown", "command").Build())
 	validateTrace(t, exp, "unknown", codes.Error)
 
-	client.Do(ctx, cmds.NewCompleted([]string{"unknown", "command"}))
+	client.Do(ctx, client.B().Arbitrary("unknown", "command").Build())
 	validateTrace(t, exp, "unknown", codes.Error)
 
 	nodes := client.Nodes()