third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py - Issue 1783073002: Run auto-formatter on files in webkitpy/layout_tests/.

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

Issue 1783073002: Run auto-formatter on files in webkitpy/layout_tests/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

index 4fa86268206434ea6c30b456a8d778e4e7e74470..df9e5ec35b06e1a5ea170e62dfb3517e34b3024f 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -61,6 +61,7 @@ NEEDS_MANUAL_REBASELINE_KEYWORD = 'NeedsManualRebaseline'

class ParseError(Exception):

def __init__(self, warnings):

super(ParseError, self).__init__()

self.warnings = warnings

@@ -75,7 +76,8 @@ class ParseError(Exception):

class TestExpectationParser(object):

"""Provides parsing facilities for lines in the test_expectation.txt file."""

- # FIXME: Rename these to *_KEYWORD as in MISSING_KEYWORD above, but make the case studdly-caps to match the actual file contents.

+ # FIXME: Rename these to *_KEYWORD as in MISSING_KEYWORD above, but make

+ # the case studdly-caps to match the actual file contents.

REBASELINE_MODIFIER = 'rebaseline'

NEEDS_REBASELINE_MODIFIER = 'needsrebaseline'

NEEDS_MANUAL_REBASELINE_MODIFIER = 'needsmanualrebaseline'

@@ -90,7 +92,8 @@ class TestExpectationParser(object):

def __init__(self, port, all_tests, is_lint_mode):

self._port = port

- self._test_configuration_converter = TestConfigurationConverter(set(port.all_test_configurations()), port.configuration_specifier_macros())

+ self._test_configuration_converter = TestConfigurationConverter(

+ set(port.all_test_configurations()), port.configuration_specifier_macros())

if all_tests:

self._all_tests = set(all_tests)

@@ -122,7 +125,6 @@ class TestExpectationParser(object):

self._parse_line(expectation_line)

return expectation_line

def expectation_for_skipped_test(self, test_name):

if not self._port.test_exists(test_name):

_log.warning('The following test %s from the Skipped list doesn\'t exist' % test_name)

@@ -158,7 +160,8 @@ class TestExpectationParser(object):

self._lint_line(expectation_line)

parsed_specifiers = set([self._parse_specifier(specifier) for specifier in expectation_line.specifiers])

- expectation_line.matching_configurations = self._test_configuration_converter.to_config_set(parsed_specifiers, expectation_line.warnings)

+ expectation_line.matching_configurations = self._test_configuration_converter.to_config_set(

+ parsed_specifiers, expectation_line.warnings)

def _lint_line(self, expectation_line):

expectations = [expectation.lower() for expectation in expectation_line.expectations]

@@ -409,20 +412,20 @@ class TestExpectationLine(object):

def __eq__(self, other):

return (self.original_string == other.original_string

- and self.filename == other.filename

- and self.line_numbers == other.line_numbers

- and self.name == other.name

- and self.path == other.path

- and self.bugs == other.bugs

- and self.specifiers == other.specifiers

- and self.parsed_specifiers == other.parsed_specifiers

- and self.matching_configurations == other.matching_configurations

- and self.expectations == other.expectations

- and self.parsed_expectations == other.parsed_expectations

- and self.comment == other.comment

- and self.matching_tests == other.matching_tests

- and self.warnings == other.warnings

- and self.is_skipped_outside_expectations_file == other.is_skipped_outside_expectations_file)

+ and self.filename == other.filename

+ and self.line_numbers == other.line_numbers

+ and self.name == other.name

+ and self.path == other.path

+ and self.bugs == other.bugs

+ and self.specifiers == other.specifiers

+ and self.parsed_specifiers == other.parsed_specifiers

+ and self.matching_configurations == other.matching_configurations

+ and self.expectations == other.expectations

+ and self.parsed_expectations == other.parsed_expectations

+ and self.comment == other.comment

+ and self.matching_tests == other.matching_tests

+ and self.warnings == other.warnings

+ and self.is_skipped_outside_expectations_file == other.is_skipped_outside_expectations_file)

def is_invalid(self):

return bool(self.warnings and self.warnings != [TestExpectationParser.MISSING_BUG_WARNING])

@@ -474,7 +477,8 @@ class TestExpectationLine(object):

return result

def to_string(self, test_configuration_converter, include_specifiers=True, include_expectations=True, include_comment=True):

- parsed_expectation_to_string = dict([[parsed_expectation, expectation_string] for expectation_string, parsed_expectation in TestExpectations.EXPECTATIONS.items()])

+ parsed_expectation_to_string = dict([[parsed_expectation, expectation_string]

+ for expectation_string, parsed_expectation in TestExpectations.EXPECTATIONS.items()])

if self.is_invalid():

return self.original_string or ''

@@ -493,7 +497,7 @@ class TestExpectationLine(object):

return "\n".join(result) if result else None

return self._format_line(self.bugs, self.specifiers, self.name, self.expectations, self.comment,

- include_specifiers, include_expectations, include_comment)

+ include_specifiers, include_expectations, include_comment)

def to_csv(self):

# Note that this doesn't include the comments.

@@ -690,7 +694,8 @@ class TestExpectationsModel(object):

continue

if model_all_expectations:

- expectation_line = TestExpectationLine.merge_expectation_lines(self.get_expectation_line(test), expectation_line, model_all_expectations)

+ expectation_line = TestExpectationLine.merge_expectation_lines(

+ self.get_expectation_line(test), expectation_line, model_all_expectations)

self._clear_expectations_for_test(test)

self._test_to_expectation_line[test] = expectation_line

@@ -787,21 +792,24 @@ class TestExpectationsModel(object):

if prev_expectation_line.matching_configurations >= expectation_line.matching_configurations:

expectation_line.warnings.append('More specific entry for %s on line %s:%s overrides line %s:%s.' % (expectation_line.name,

- self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers,

- self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))

+ self._shorten_filename(

+ prev_expectation_line.filename), prev_expectation_line.line_numbers,

+ self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))

# FIXME: return False if we want more specific to win.

return True

if prev_expectation_line.matching_configurations <= expectation_line.matching_configurations:

expectation_line.warnings.append('More specific entry for %s on line %s:%s overrides line %s:%s.' % (expectation_line.name,

- self._shorten_filename(expectation_line.filename), expectation_line.line_numbers,

- self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers))

+ self._shorten_filename(

+ expectation_line.filename), expectation_line.line_numbers,

+ self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers))

return True

if prev_expectation_line.matching_configurations & expectation_line.matching_configurations:

expectation_line.warnings.append('Entries for %s on lines %s:%s and %s:%s match overlapping sets of configurations.' % (expectation_line.name,

- self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers,

- self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))

+ self._shorten_filename(

+ prev_expectation_line.filename), prev_expectation_line.line_numbers,

+ self._shorten_filename(expectation_line.filename), expectation_line.line_numbers))

return True

# Configuration sets are disjoint, then.

@@ -854,7 +862,7 @@ class TestExpectations(object):

TestExpectationParser.WONTFIX_MODIFIER: WONTFIX,

TestExpectationParser.SLOW_MODIFIER: SLOW,

TestExpectationParser.REBASELINE_MODIFIER: REBASELINE,

- }

+ }

EXPECTATIONS_TO_STRING = dict((k, v) for (v, k) in EXPECTATIONS.iteritems())

@@ -1058,7 +1066,7 @@ class TestExpectations(object):

for expectation in self._expectations:

for warning in expectation.warnings:

warnings.append('%s:%s %s %s' % (self._shorten_filename(expectation.filename), expectation.line_numbers,

- warning, expectation.name if expectation.expectations else expectation.original_string))

+ warning, expectation.name if expectation.expectations else expectation.original_string))

if warnings:

self._has_warnings = True