From 2360916e1b44798b4c5f74cfa14ca8f0c5af7f91 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 31 Jul 2024 15:35:22 +0900 Subject: [PATCH] Fix tests Signed-off-by: Florent Poinsard --- go/test/endtoend/vtgate/queries/timeout/timeout_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go index 9c81a6c5822..eb91982b6e0 100644 --- a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go +++ b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go @@ -96,5 +96,9 @@ func TestQueryTimeoutWithTables(t *testing.T) { _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=20 */ sleep(0.1) from t1 where id1 = 1") require.Error(t, err) assert.Contains(t, err.Error(), "context deadline exceeded") - assert.Contains(t, err.Error(), "(errno 1317) (sqlstate 70100)") + vttabletVersion, err := cluster.GetMajorVersion("vttablet") + require.NoError(t, err) + if vttabletVersion <= 19 { + assert.Contains(t, err.Error(), "(errno 1317) (sqlstate 70100)") + } }