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

test: Fix flaky TestQuerier_ValidateQueryTimeRange_MaxQueryLength #10529

Merged
merged 1 commit into from
Jan 28, 2025
Merged

test: Fix flaky TestQuerier_ValidateQueryTimeRange_MaxQueryLength #10529

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
17 changes: 9 additions & 8 deletions pkg/querier/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,7 @@ func TestQuerier_ValidateQueryTimeRange(t *testing.T) {

func TestQuerier_ValidateQueryTimeRange_MaxQueryLength(t *testing.T) {
const maxQueryLength = 30 * 24 * time.Hour
now := time.Now()

tests := map[string]struct {
query string
Expand All @@ -744,26 +745,26 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLength(t *testing.T) {
}{
"should allow query on short time range and rate time window close to the limit": {
query: "rate(foo[29d])",
queryStartTime: time.Now().Add(-time.Hour),
queryEndTime: time.Now(),
queryStartTime: now.Add(-time.Hour),
queryEndTime: now,
expected: nil,
},
"should allow query on large time range close to the limit and short rate time window": {
query: "rate(foo[1m])",
queryStartTime: time.Now().Add(-maxQueryLength).Add(time.Hour),
queryEndTime: time.Now(),
queryStartTime: now.Add(-maxQueryLength).Add(time.Hour),
queryEndTime: now,
expected: nil,
},
"should forbid query on short time range and rate time window over the limit": {
query: "rate(foo[31d])",
queryStartTime: time.Now().Add(-time.Hour),
queryEndTime: time.Now(),
queryStartTime: now.Add(-time.Hour),
queryEndTime: now,
expected: errors.Errorf("expanding series: %s", NewMaxQueryLengthError(745*time.Hour-time.Millisecond, 720*time.Hour)),
},
"should forbid query on large time range over the limit and short rate time window": {
query: "rate(foo[1m])",
queryStartTime: time.Now().Add(-maxQueryLength).Add(-time.Hour),
queryEndTime: time.Now(),
queryStartTime: now.Add(-maxQueryLength).Add(-time.Hour),
queryEndTime: now,
expected: errors.Errorf("expanding series: %s", NewMaxQueryLengthError((721*time.Hour)+time.Minute-time.Millisecond, 720*time.Hour)),
},
}
Expand Down