third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py - Issue 2014063002: Run format-webkit on webkitpy code (without string conversion).

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 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 7 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/layout_package/bot_test_expectations.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.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 62372c1ac5ed290a6c73401e69695c1bcf859ade..6d623296974ed79b1dbb12d8da8685ed7415935e 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

@@ -27,6 +27,7 @@

# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import copy

+from functools import reduce

class TestConfiguration(object):

@@ -136,7 +137,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)