test: TestQueryTimeoutWithShardTargeting fix flaky test (#18242)

vitess-bot[bot] · vitess-bot · commit 05e266651217 · 2025-05-07T16:36:07.000Z
Signed-off-by: Harshit Gangal &lt;harshit@planetscale.com&gt;
diff --git a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go
@@ -125,7 +125,7 @@ func TestQueryTimeoutWithShardTargeting(t *testing.T) {
 	for _, query := range queries {
 		t.Run(query, func(t *testing.T) {
 			_, err := utils.ExecAllowError(t, mcmp.VtConn, query)
-			assert.ErrorContains(t, err, "context deadline exceeded")
+			// the error message can be different based on VTGate or VTTABLET or grpc error.
 			assert.ErrorContains(t, err, "(errno 1317) (sqlstate 70100)")
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func TestQueryTimeoutWithShardTargeting(t *testing.T) {`
`125`	`125`	`for _, query := range queries {`
`126`	`126`	`t.Run(query, func(t *testing.T) {`
`127`	`127`	`_, err := utils.ExecAllowError(t, mcmp.VtConn, query)`
`128`		`- assert.ErrorContains(t, err, "context deadline exceeded")`
	`128`	`+ // the error message can be different based on VTGate or VTTABLET or grpc error.`
`129`	`129`	`assert.ErrorContains(t, err, "(errno 1317) (sqlstate 70100)")`
`130`	`130`	`})`
`131`	`131`	`}`