[contrib] validate_failures.py: Renaming cleanup
Rename _VALID_TEST_RESULTS* to _INTERESTING_RESULTS*,
which better describes the purpose. Subsequent patch
will define _VALID_TEST_RESULTS to accept all valid
result entries, including PASS, XFAIL, etc.
Change-Id: Iad74d058d48f40ba08d9a87e18f93770fd6e4089
diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
index 11bb6f7..5a4df6b 100755
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -60,10 +60,10 @@
import re
import sys
-_VALID_TEST_RESULTS = [ 'FAIL', 'UNRESOLVED', 'XPASS', 'ERROR' ]
+_INTERESTING_RESULTS = [ 'FAIL', 'UNRESOLVED', 'XPASS', 'ERROR' ]
# <STATE>: <NAME> <DESCRIPTION"
-_VALID_TEST_RESULTS_REX = re.compile('(%s):\s*(\S+)\s*(.*)'
- % "|".join(_VALID_TEST_RESULTS))
+_INTERESTING_RESULTS_REX = re.compile('(%s):\s*(\S+)\s*(.*)'
+ % "|".join(_INTERESTING_RESULTS))
# Formats of .sum file sections
_TOOL_LINE_FORMAT = '\t\t=== %s tests ===\n'
@@ -134,7 +134,7 @@
try:
(self.state,
self.name,
- self.description) = _VALID_TEST_RESULTS_REX.match(summary_line).groups()
+ self.description) = _INTERESTING_RESULTS_REX.match(summary_line).groups()
if _OPTIONS.srcpath_regex and _OPTIONS.srcpath_regex != '':
self.description = re.sub(_OPTIONS.srcpath_regex, '',
self.description)
@@ -154,7 +154,7 @@
except ValueError:
Error('Cannot parse summary line "%s"' % summary_line)
- if self.state not in _VALID_TEST_RESULTS:
+ if self.state not in _INTERESTING_RESULTS:
Error('Invalid test result %s in "%s" (parsed as "%s")' % (
self.state, summary_line, self))
@@ -286,7 +286,7 @@
def SplitAttributesFromSummaryLine(line):
"""Splits off attributes from a summary line, if present."""
- if '|' in line and not _VALID_TEST_RESULTS_REX.match(line):
+ if '|' in line and not _INTERESTING_RESULTS_REX.match(line):
(attrs, line) = line.split('|', 1)
attrs = attrs.strip()
else:
@@ -298,17 +298,17 @@
def IsInterestingResult(result_set, line):
"""Return True if line is one of the summary lines we care about."""
(_, line) = SplitAttributesFromSummaryLine(line)
- valid_result = bool(_VALID_TEST_RESULTS_REX.match(line))
+ interesting_result = bool(_INTERESTING_RESULTS_REX.match(line))
# If there's no tool defined it means that either the results section hasn't
# started yet, or it is already over.
- if valid_result and result_set.current_tool is None:
+ if interesting_result and result_set.current_tool is None:
if _OPTIONS.verbosity >= 3:
print(f'WARNING: Result "{line}" found outside sum file boundaries.',
file=sys.stderr)
return False
- return valid_result
+ return interesting_result
def IsToolLine(line):