Merge pull request #911 from cloudflare/tests

Add more tests
cloudflare · Mar 14, 2024 · 9e508e9 · 9e508e9
2 parents eb933aa + 49a19b8
commit 9e508e9
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 4 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+          cache: false
 
       - name: Fetch test rules
         run: make -C cmd/pint/bench fetch

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ permissions:
 jobs:
   ci:
     runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.head.repo.full_name == 'cloudflare/pint' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -29,6 +30,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+          cache: false
 
       - name: Compile pint
         run: make build

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+          cache: false
 
       - name: Build binary
         run: make

diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+          cache: false
 
       - name: Run go mod tidy
         run: go mod tidy

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,6 +21,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+          cache: false
 
       - name: Test
         run: make test

diff --git a/internal/checks/alerts_count.go b/internal/checks/alerts_count.go
@@ -118,7 +118,7 @@ func (c AlertsCheck) Check(ctx context.Context, _ string, rule parser.Rule, _ []
 		Lines:    rule.AlertingRule.Expr.Value.Lines,
 		Reporter: c.Reporter(),
 		Text:     fmt.Sprintf("%s would trigger %d alert(s) in the last %s.", promText(c.prom.Name(), qr.URI), alerts, output.HumanizeDuration(delta)),
-		Details: fmt.Sprintf(`To get a preview of the alerts that would fire please [click here](%s/graph?g0.expr=%s&g0.tab=1&g0.range_input=%s).`,
+		Details: fmt.Sprintf(`To get a preview of the alerts that would fire please [click here](%s/graph?g0.expr=%s&g0.tab=0&g0.range_input=%s).`,
 			qr.PublicURI, url.QueryEscape(rule.AlertingRule.Expr.Value.Value), output.HumanizeDuration(delta),
 		),
 		Severity: c.severity,

diff --git a/internal/checks/alerts_count_test.go b/internal/checks/alerts_count_test.go
@@ -23,7 +23,7 @@ func alertsText(name, uri string, count int, since string) string {
 
 func alertsDetails(uri, query, since string) string {
 	return fmt.Sprintf(
-		`To get a preview of the alerts that would fire please [click here](%s/graph?g0.expr=%s&g0.tab=1&g0.range_input=%s).`,
+		`To get a preview of the alerts that would fire please [click here](%s/graph?g0.expr=%s&g0.tab=0&g0.range_input=%s).`,
 		uri, url.QueryEscape(query), since,
 	)
 }

diff --git a/internal/checks/promql_series_test.go b/internal/checks/promql_series_test.go
@@ -3338,7 +3338,7 @@ func TestSeriesCheck(t *testing.T) {
 			content: `
 - alert: foo
   expr: |
-    (sum(sometimes{foo!=\"bar\"} or vector(0)))
+    (sum(sometimes{foo!="bar"} or vector(0)))
     or
     (bob > 10)
     or
@@ -3353,14 +3353,76 @@ func TestSeriesCheck(t *testing.T) {
 			content: `
 - alert: foo
   expr: |
-    (sum(sometimes{foo!=\"bar\"} or vector(0)))
+    (sum(sometimes{foo!="bar"} or vector(0)))
     or
     ((bob > 10) or sum(foo) or vector(1))
 `,
 			checker:    newSeriesCheck,
 			prometheus: newSimpleProm,
 			problems:   noProblems,
 		},
+		{
+			description: "metric with fallback / 4",
+			content: `
+- alert: foo
+  expr: |
+    (
+      sum(sometimes{foo!="bar"})
+      or
+      vector(1)
+    ) and (
+      ((bob > 10) or sum(bar))
+      or
+      notfound > 0
+    )
+`,
+			checker:    newSeriesCheck,
+			prometheus: newSimpleProm,
+			problems: func(uri string) []checks.Problem {
+				return []checks.Problem{
+					{
+						Lines: parser.LineRange{
+							First: 3,
+							Last:  12,
+						},
+						Reporter: checks.SeriesCheckName,
+						Text:     noMetricText("prom", uri, "bob", "1w"),
+						Details:  checks.SeriesCheckCommonProblemDetails,
+						Severity: checks.Bug,
+					},
+					{
+						Lines: parser.LineRange{
+							First: 3,
+							Last:  12,
+						},
+						Reporter: checks.SeriesCheckName,
+						Text:     noMetricText("prom", uri, "bar", "1w"),
+						Details:  checks.SeriesCheckCommonProblemDetails,
+						Severity: checks.Bug,
+					},
+					{
+						Lines: parser.LineRange{
+							First: 3,
+							Last:  12,
+						},
+						Reporter: checks.SeriesCheckName,
+						Text:     noMetricText("prom", uri, "notfound", "1w"),
+						Details:  checks.SeriesCheckCommonProblemDetails,
+						Severity: checks.Bug,
+					},
+				}
+			},
+			mocks: []*prometheusMock{
+				{
+					conds: []requestCondition{requireQueryPath},
+					resp:  respondWithEmptyVector(),
+				},
+				{
+					conds: []requestCondition{requireRangeQueryPath},
+					resp:  respondWithEmptyMatrix(),
+				},
+			},
+		},
 	}
 	runTests(t, testCases)
 }