Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

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

Issue 546133003: Reformat webkitpy.layout_tests w/ format-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
Index: Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py b/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
index 2527c8f1eae4a2e4f297dc3760b079d1cf958387..12d18c6c213ac32880e731d29f4a396c2828e646 100644
--- a/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
+++ b/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py
@@ -27,9 +27,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import copy
+from functools import reduce
class TestConfiguration(object):
+
def __init__(self, version, architecture, build_type):
self.version = version
self.architecture = architecture
@@ -47,7 +49,7 @@ class TestConfiguration(object):
return self.__dict__.keys()
def __str__(self):
- return ("<%(version)s, %(architecture)s, %(build_type)s>" %
+ return ('<%(version)s, %(architecture)s, %(build_type)s>' %
self.__dict__)
def __repr__(self):
@@ -65,6 +67,7 @@ class TestConfiguration(object):
class SpecifierSorter(object):
+
def __init__(self, all_test_configurations=None, macros=None):
self._specifier_to_category = {}
@@ -109,6 +112,7 @@ class SpecifierSorter(object):
class TestConfigurationConverter(object):
+
def __init__(self, all_test_configurations, configuration_macros=None):
self._all_test_configurations = all_test_configurations
self._configuration_macros = configuration_macros or {}
@@ -133,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)
@@ -282,7 +287,6 @@ class TestConfigurationConverter(object):
while try_abbreviating(self._collapsing_sets_by_size.values()):
pass
-
# 4) Substitute specifier subsets that match macros witin each set:
# (xp, win7, release) -> (win, release)
self.collapse_macros(self._configuration_macros, specifiers_list)

Powered by Google App Engine
This is Rietveld 408576698