When importing wpt tests, add skip expectations for tests with missing results.

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 expectations and baselines when updating web-platform-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 183 matching lines @@
                 if next_item == keys[-1]:
                     if found_match:
                         merged_dict[tuple(matching_value_keys)] = dictionary[current_key]
                         keys = [k for k in keys if k not in matching_value_keys]
                     else:
                         merged_dict[current_key] = dictionary[current_key]
                         keys.remove(current_key)
             matching_value_keys = set()
         return merged_dict
 
-    def get_expectations(self, results):
+    def get_expectations(self, results, test_name=''):
+
         """Returns a set of test expectations to use based on results.
 
         Returns a set of one or more test expectations based on the expected
         and actual results of a given test name. This function is to decide
         expectations for tests that could not be rebaselined.
 
         Args:
             results: A dictionary that maps one test to its results. Example:
                 {
                     'test_name': {
                         'expected': 'PASS',
                         'actual': 'FAIL',
                         'bug': 'crbug.com/11111'
                     }
                 }
+            test_name: The test name string (optional).
 
         Returns:
             A set of one or more test expectation strings with the first letter
             capitalized. Example: set(['Failure', 'Timeout']).
         """
+        # If the result is MISSING, this implies that the test was not
+        # rebaselined and has an actual result but no baseline. We can't
+        # add a Missing expectation (this is not allowed), but no other
+        # expectation is correct.
+        # We also want to skip any new manual tests that are not automated;
+        # see crbug.com/708241 for context.
+        if (results['actual'] == 'MISSING' or
+                '-manual.' in test_name and results['actual'] == 'TIMEOUT'):
+            return {'Skip'}
         expectations = set()
         failure_types = ('TEXT', 'IMAGE+TEXT', 'IMAGE', 'AUDIO')
         other_types = ('TIMEOUT', 'CRASH', 'PASS')
         for actual in results['actual'].split():
             if actual in failure_types:
                 expectations.add('Failure')
             if actual in other_types:
                 expectations.add(actual.capitalize())
         return expectations
 
@@ skipping 27 matching lines @@
                 line_list.append(self._create_line(test_name, port_names, results))
         return line_list
 
     def _create_line(self, test_name, port_names, results):
         """Constructs one test expectations line string."""
         line_parts = [results['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(results, test_name)))
 
-        # Skip new manual tests; see crbug.com/708241 for context.
-        if '-manual.' in test_name and results['actual'] in ('MISSING', 'TIMEOUT'):
-            line_parts.append('[ Skip ]')
-        else:
-            line_parts.append('[ %s ]' % ' '.join(self.get_expectations(results)))
         return ' '.join(line_parts)
 
     def specifier_part(self, port_names, test_name):
         """Returns the specifier part for a new test expectations line.
 
         Args:
             port_names: A list of full port names that the line should apply to.
             test_name: The test name for the expectation line.
 
         Returns:
@@ skipping 158 matching lines @@
         if result['actual'] in ('CRASH', 'TIMEOUT', 'MISSING'):
             return False
         return True
 
     def is_reference_test(self, test_path):
         """Checks whether a given file is a testharness.js test."""
         return bool(self.port.reference_files(test_path))
 
     def _get_try_bots(self):
         return self.host.builders.all_try_builder_names()