Rename expected_fail_pattern to expected_fail_regexp

Signed-off-by: Charles Korn <charles.korn@grafana.com>
prometheus · May 9, 2024 · 199ff32 · 199ff32
1 parent 541b320
commit 199ff32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/promql/test.go b/promql/test.go
@@ -298,11 +298,11 @@ func (t *test) parseEval(lines []string, i int) (int, *evalCmd, error) {
 			break
 		}
 
-		if cmd.fail && strings.HasPrefix(defLine, "expected_fail_pattern") {
-			pattern := strings.TrimSpace(strings.TrimPrefix(defLine, "expected_fail_pattern"))
-			cmd.expectedFailPattern, err = regexp.Compile(pattern)
+		if cmd.fail && strings.HasPrefix(defLine, "expected_fail_regexp") {
+			pattern := strings.TrimSpace(strings.TrimPrefix(defLine, "expected_fail_regexp"))
+			cmd.expectedFailRegexp, err = regexp.Compile(pattern)
 			if err != nil {
-				return i, nil, formatErr("invalid regexp '%s' for expected_fail_pattern: %w", pattern, err)
+				return i, nil, formatErr("invalid regexp '%s' for expected_fail_regexp: %w", pattern, err)
 			}
 			break
 		}
@@ -459,7 +459,7 @@ type evalCmd struct {
 	isRange             bool // if false, instant query
 	fail, ordered       bool
 	expectedFailMessage string
-	expectedFailPattern *regexp.Regexp
+	expectedFailRegexp  *regexp.Regexp
 
 	metrics  map[uint64]labels.Labels
 	expected map[uint64]entry
@@ -655,9 +655,9 @@ func (ev *evalCmd) checkExpectedFailure(actual error) error {
 		}
 	}
 
-	if ev.expectedFailPattern != nil {
-		if !ev.expectedFailPattern.MatchString(actual.Error()) {
-			return fmt.Errorf("expected error matching pattern %q evaluating query %q (line %d), but got: %s", ev.expectedFailPattern.String(), ev.expr, ev.line, actual.Error())
+	if ev.expectedFailRegexp != nil {
+		if !ev.expectedFailRegexp.MatchString(actual.Error()) {
+			return fmt.Errorf("expected error matching pattern %q evaluating query %q (line %d), but got: %s", ev.expectedFailRegexp.String(), ev.expr, ev.line, actual.Error())
 		}
 	}
 

diff --git a/promql/test_test.go b/promql/test_test.go
@@ -291,7 +291,7 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail instant at 0m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern vector .* contain metrics
+	expected_fail_regexp vector .* contain metrics
 `,
 		},
 		"instant query expected to fail with error matching pattern, and query fails with a different error": {
@@ -301,7 +301,7 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail instant at 0m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern something else went wrong
+	expected_fail_regexp something else went wrong
 `,
 			expectedError: `expected error matching pattern "something else went wrong" evaluating query "ceil({__name__=~'testmetric1|testmetric2'})" (line 6), but got: vector cannot contain metrics with the same labelset`,
 		},
@@ -312,9 +312,9 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail instant at 0m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern [
+	expected_fail_regexp [
 `,
-			expectedError: `error in eval ceil({__name__=~'testmetric1|testmetric2'}) (line 7): invalid regexp '[' for expected_fail_pattern: error parsing regexp: missing closing ]: ` + "`[`",
+			expectedError: `error in eval ceil({__name__=~'testmetric1|testmetric2'}) (line 7): invalid regexp '[' for expected_fail_regexp: error parsing regexp: missing closing ]: ` + "`[`",
 		},
 		"instant query with results expected to match provided order, and result is in expected order": {
 			input: testData + `
@@ -465,7 +465,7 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail range from 0 to 10m step 5m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern vector .* contain metrics
+	expected_fail_regexp vector .* contain metrics
 `,
 		},
 		"range query expected to fail with error matching pattern, and query fails with a different error": {
@@ -475,7 +475,7 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail range from 0 to 10m step 5m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern something else went wrong
+	expected_fail_regexp something else went wrong
 `,
 			expectedError: `expected error matching pattern "something else went wrong" evaluating query "ceil({__name__=~'testmetric1|testmetric2'})" (line 6), but got: vector cannot contain metrics with the same labelset`,
 		},
@@ -486,9 +486,9 @@ load 5m
 	testmetric2{src="a",dst="b"} 1
 
 eval_fail range from 0 to 10m step 5m ceil({__name__=~'testmetric1|testmetric2'})
-	expected_fail_pattern [
+	expected_fail_regexp [
 `,
-			expectedError: `error in eval ceil({__name__=~'testmetric1|testmetric2'}) (line 7): invalid regexp '[' for expected_fail_pattern: error parsing regexp: missing closing ]: ` + "`[`",
+			expectedError: `error in eval ceil({__name__=~'testmetric1|testmetric2'}) (line 7): invalid regexp '[' for expected_fail_regexp: error parsing regexp: missing closing ]: ` + "`[`",
 		},
 		"range query with from and to timestamps in wrong order": {
 			input:         `eval range from 10m to 9m step 5m vector(0)`,