Simplify platform specifier list added by w3c-test-autoroller.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations.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.
 
 """A class for updating layout test expectations when updating w3c tests.
 
 Specifically, this class fetches results from try bots for the current CL, and:
   1. Downloads new baseline files for any tests that can be rebaselined.
   2. Updates the generic TestExpectations file for any other failing tests.
 
@@ skipping 234 matching lines @@
         return expectations
 
     def create_line_list(self, merged_results):
         """Creates list of test expectations lines.
 
         Traverses through the given |merged_results| dictionary and parses the
         value to create one test expectations line per key.
 
         Args:
             merged_results: A merged_results with the format:
-                {
-                    'test_name': {
-                        'platform': {
-                            'expected: 'PASS',
-                            'actual': 'FAIL',
-                            'bug': 'crbug.com/11111'
-                        }
-                    }
-                }
+            {test: {platforms: {'expected: '...', 'actual': '...', 'bug': '...'}}}
 
         Returns:
             A list of test expectations lines with the format:
-            ['BUG_URL [PLATFORM(S)] TEST_MAME [EXPECTATION(S)]']
+            ['BUG_URL [PLATFORM(S)] TEST_NAME [EXPECTATION(S)]']
         """
         line_list = []
         for test_name, platform_results in merged_results.iteritems():
             for platform in platform_results:
-                if test_name.startswith('external'):
-                    platform_list = []
-                    bug = []
-                    expectations = []
-                    if isinstance(platform, tuple):
-                        platform_list = list(platform)
-                    else:
-                        platform_list.append(platform)
-                    bug.append(platform_results[platform]['bug'])
-                    expectations = self.get_expectations(platform_results[platform])
-                    line = '%s [ %s ] %s [ %s ]' % (bug[0], ' '.join(platform_list), test_name, ' '.join(expectations))
-                    line_list.append(str(line))
+                if not test_name.startswith('external/'):
+                    continue
+                bug = []
+                expectations = []
+                platform_specifier = self._platform_specifier(platform)
+                bug.append(platform_results[platform]['bug'])
+                expectations = self.get_expectations(platform_results[platform])
+                line = '%s [ %s ] %s [ %s ]' % (bug[0], platform_specifier, test_name, ' '.join(expectations))
+                line_list.append(str(line))
         return line_list
 
+    def _platform_specifier(self, platform):
+        if isinstance(platform, tuple):
+            return ' '.join(sorted(platform))
+        return platform
+
     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.
 
         Args:
             line_list: A list of lines to add to the TestExpectations file.
         """
@@ skipping 79 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()