Simplify specifiers when all platforms are covered, and sort lines.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Updates layout test expectations and baselines when updating w3c tests.
 
 Specifically, this class fetches results from try bots for the current CL, then
 (1) downloads new baseline files for any tests that can be rebaselined, and
 (2) updates the generic TestExpectations file for any other failing tests.
 """
@@ skipping 238 matching lines @@
                             'bug': 'crbug.com/11111'
                         }
                     }
                 }
 
         Returns:
             A list of test expectations lines with the format:
             ['BUG_URL [PLATFORM(S)] TEST_NAME [EXPECTATION(S)]']
         """
         line_list = []
-        for test_name, port_results in merged_results.iteritems():
+        for test_name, port_results in sorted(merged_results.iteritems()):
             for port_names in sorted(port_results):
                 if test_name.startswith('external'):
                     line_parts = [port_results[port_names]['bug']]
                     specifier_part = self.specifier_part(self.to_list(port_names), test_name)
                     if specifier_part:
                         line_parts.append(specifier_part)
                     line_parts.append(test_name)
                     line_parts.append('[ %s ]' % ' '.join(self.get_expectations(port_results[port_names])))
                     line_list.append(' '.join(line_parts))
         return line_list
@@ skipping 62 matching lines @@
             supported platforms, then an empty list is returned.
             This list will be sorted and have capitalized specifier strings.
         """
         specifiers = {specifier.lower() for specifier in specifiers}
         for macro_specifier, version_specifiers in configuration_specifier_macros.iteritems():
             macro_specifier = macro_specifier.lower()
             version_specifiers = {specifier.lower() for specifier in version_specifiers}
             if version_specifiers.issubset(specifiers):
                 specifiers -= version_specifiers
                 specifiers.add(macro_specifier)
-        if specifiers == set(configuration_specifier_macros):
+        if specifiers == {macro.lower() for macro in configuration_specifier_macros.keys()}:
             return []
         return sorted(specifier.capitalize() for specifier in specifiers)
 
     def write_to_test_expectations(self, line_list):
         """Writes to TestExpectations.
 
         The place in the file where the new lines are inserted is after a
         marker comment line. If this marker comment line is not found, it will
         be added to the end of the file.
 
@@ skipping 86 matching lines @@
 
         Args:
             test_path: A file path relative to the layout tests directory.
                 This might correspond to a deleted file or a non-test.
         """
         absolute_path = self.host.filesystem.join(self.finder.layout_tests_dir(), test_path)
         test_parser = TestParser(absolute_path, self.host)
         if not test_parser.test_doc:
             return False
         return test_parser.is_jstest()