Skip to content

Commit

Permalink
Fix a bad rebase between grafana#1970 and grafana#1965.
Browse files Browse the repository at this point in the history
Signed-off-by: Cyril Tovena <[email protected]>
  • Loading branch information
cyriltovena committed Apr 29, 2020
1 parent 34f9c60 commit df51725
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkg/logql/engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1012,8 +1012,7 @@ func TestEngine_NewRangeQuery(t *testing.T) {
sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) /
sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m]))
) * 2
`,
time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, logproto.FORWARD, 100,
`, time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, 0, logproto.FORWARD, 100,
[][]*logproto.Stream{
{
newStream(testSize, factor(5, identity), `{app="foo"}`),
Expand Down Expand Up @@ -1041,7 +1040,7 @@ func TestEngine_NewRangeQuery(t *testing.T) {
sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m]))
) + 1
`,
time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, logproto.FORWARD, 100,
time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, 0, logproto.FORWARD, 100,
[][]*logproto.Stream{
{
newStream(testSize, factor(5, identity), `{app="foo"}`),
Expand Down

0 comments on commit df51725

Please sign in to comment.