third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py - Issue 1806393002: Run yapf on files in webkit/layout_tests/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1806393002: Run yapf on files in webkit/layout_tests/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/lint_test_expectations_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_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_configuration.py

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

index 2c8955e665cd1bc7479cd14825aefb028ef947d0..5a72ddea72bdead39d2fabadb4dde6a71bb16ac4 100644

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

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

@@ -47,8 +47,7 @@ class TestConfiguration(object):

return self.__dict__.keys()

def __str__(self):

- return ("<%(version)s, %(architecture)s, %(build_type)s>" %

- self.__dict__)

+ return ("<%(version)s, %(architecture)s, %(build_type)s>" % self.__dict__)

def __repr__(self):

return "TestConfig(version='%(version)s', architecture='%(architecture)s', build_type='%(build_type)s')" % self.__dict__

@@ -133,7 +132,8 @@ class TestConfigurationConverter(object):

for specifier, sets_by_category in matching_sets_by_category.items():

for category, set_by_category in sets_by_category.items():

- if len(set_by_category) == 1 and self._specifier_sorter.category_priority(category) > self._specifier_sorter.specifier_priority(specifier):

+ if len(set_by_category) == 1 and self._specifier_sorter.category_priority(

+ category) > self._specifier_sorter.specifier_priority(specifier):

self._junk_specifier_combinations[specifier] = set_by_category

self._specifier_sorter.add_macros(configuration_macros)

@@ -282,7 +282,6 @@ class TestConfigurationConverter(object):

while try_abbreviating(self._collapsing_sets_by_size.values()):

pass

# 4) Substitute specifier subsets that match macros witin each set:

# (win7, win10, release) -> (win, release)

self.collapse_macros(self._configuration_macros, specifiers_list)