From facfa8a83cd65cd5fb59a8553b2062bcbacf3a6a Mon Sep 17 00:00:00 2001 From: Harshit Gangal Date: Mon, 23 Sep 2024 13:03:27 +0530 Subject: [PATCH] flaky test fix for query timeout change Signed-off-by: Harshit Gangal --- go/test/endtoend/vtgate/queries/timeout/timeout_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go index 699b1bd675a..31955cbafbe 100644 --- a/go/test/endtoend/vtgate/queries/timeout/timeout_test.go +++ b/go/test/endtoend/vtgate/queries/timeout/timeout_test.go @@ -69,6 +69,7 @@ func TestQueryTimeoutWithDual(t *testing.T) { _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=15 */ sleep(0.001) from dual") assert.NoError(t, err) // infinite query timeout overriding all defaults + utils.SkipIfBinaryIsBelowVersion(t, 21, "vttablet") _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=0 */ sleep(5) from dual") assert.NoError(t, err) } @@ -131,6 +132,7 @@ func TestQueryTimeoutWithShardTargeting(t *testing.T) { } func TestQueryTimeoutWithoutVTGateDefault(t *testing.T) { + utils.SkipIfBinaryIsBelowVersion(t, 21, "vttablet") // disable query timeout clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, "--query-timeout", "0") @@ -184,6 +186,7 @@ func TestQueryTimeoutWithoutVTGateDefault(t *testing.T) { // and not just individual routes. func TestOverallQueryTimeout(t *testing.T) { utils.SkipIfBinaryIsBelowVersion(t, 21, "vtgate") + utils.SkipIfBinaryIsBelowVersion(t, 21, "vttablet") mcmp, closer := start(t) defer closer()