Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

flaky test fix for query timeout change #16821

Merged
merged 1 commit into from
Sep 23, 2024
Merged

flaky test fix for query timeout change #16821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions go/test/endtoend/vtgate/queries/timeout/timeout_test.go
View file
Open in desktop
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
Loading