Skip to content

Commit

Permalink
flaky test fix for query timeout change (#16821)
Browse files Browse the repository at this point in the history
Signed-off-by: Harshit Gangal <[email protected]>
  • Loading branch information
harshit-gangal authored Sep 23, 2024
1 parent c3bbce2 commit 9563fcb
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions go/test/endtoend/vtgate/queries/timeout/timeout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 9563fcb

Please sign in to comment.