In update-w3c-test-expectations, handle failure to fetch results.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/update_w3c_test_expectations_unittest.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.
 
 import unittest
 
 from webkitpy.common.host_mock import MockHost
+from webkitpy.common.net.buildbot import Build
+from webkitpy.common.net.buildbot_mock import MockBuildBot
+from webkitpy.common.net.layouttestresults import LayoutTestResult, LayoutTestResults
 from webkitpy.common.webkit_finder import WebKitFinder
-from webkitpy.common.net.layouttestresults import LayoutTestResult
+from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.w3c.update_w3c_test_expectations import W3CExpectationsLineAdder
 
 
 class UpdateW3CTestExpectationsTest(unittest.TestCase, W3CExpectationsLineAdder):

[qyearsley, 2016/08/25 16:02:47]

Another TODO which I plan to do as an immediate follow-up to this CL:

Make this class not subclass W3CExpectationsLineAdder.

 
     def setUp(self):
         self.host = MockHost()
         self.mock_dict_one = {
             'fake/test/path.html': {
                 'one': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}
             }
         }
         self.mock_dict_two = {
             'imported/fake/test/path.html': {
                 'one': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'},
                 'three': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}
             }
         }
         self.mock_dict_three = {
             'imported/fake/test/path.html': {
                 'four': {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}}
         }
         self.mock_dict_four = {
             'imported/fake/test/path.html': {
                 'one': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'}
             }
         }
+        self.host.builders = BuilderList({
+            'mac': {'port_name': 'test-mac'},
+        })
+
+    def tearDown(self):
+        self.host = None
+
+    def test_get_failing_results_dict_only_passing_results(self):
+        self.host.buildbot.set_results(Build('mac', 123), LayoutTestResults({
+            'tests': {
+                'fake': {
+                    'test.html': {
+                        'passing-test.html': {
+                            'expected': 'PASS',
+                            'actual': 'PASS',
+                        },
+                    },
+                },
+            },
+        }))
+        line_adder = W3CExpectationsLineAdder(self.host)
+        self.assertEqual(line_adder.get_failing_results_dict(self.host.buildbot, 'mac', 123), {})
+
+    def test_get_failing_results_dict_no_results(self):
+        self.host.buildbot = MockBuildBot()
+        self.host.buildbot.set_results(Build('mac', 123), None)
+        line_adder = W3CExpectationsLineAdder(self.host)
+        self.assertEqual(line_adder.get_failing_results_dict(self.host.buildbot, 'mac', 123), {})
+
+    def test_get_failing_results_dict_some_failing_results(self):
+        self.host.buildbot.set_results(Build('mac', 123), LayoutTestResults({
+            'tests': {
+                'fake': {
+                    'test.html': {
+                        'failing-test.html': {
+                            'expected': 'PASS',
+                            'actual': 'IMAGE',
+                            'is_unexpected': True,
+                        },
+                    },
+                },
+            },
+        }))
+        line_adder = W3CExpectationsLineAdder(self.host)
+        self.assertEqual(line_adder.get_failing_results_dict(self.host.buildbot, 'mac', 123), {
+            'fake/test.html/failing-test.html': {
+                'Mac': {
+                    'actual': 'IMAGE',
+                    'expected': 'PASS',
+                    'bug': 'crbug.com/626703',
+                },
+            },
+        })
 
     def test_merge_same_valued_keys(self):
         self.assertEqual(
             self.merge_same_valued_keys(self.mock_dict_one['fake/test/path.html']),
             {('two', 'one'): {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'}})
         self.assertEqual(
             self.merge_same_valued_keys(self.mock_dict_two['imported/fake/test/path.html']),
             {
                 ('three', 'one'): {'expected': 'FAIL', 'actual': 'PASS', 'bug': 'crbug.com/626703'},
                 'two': {'expected': 'FAIL', 'actual': 'TIMEOUT', 'bug': 'crbug.com/626703'}
@@ skipping 104 matching lines @@
         self.host.filesystem.files['/mock-checkout/imported/fake/test/path.html'] = '''
                 <script src="/resources/testharness.js"></script>'''
         finder = WebKitFinder(self.host.filesystem)
         line_adder = W3CExpectationsLineAdder(self.host)
         tests = ['imported/fake/test/path.html']
         test_dict = {'../../../imported/fake/test/path.html': self.mock_dict_two['imported/fake/test/path.html']}
         tests_to_rebaseline, tests_results = line_adder.get_tests_to_rebaseline(
             finder, tests, test_dict)
         self.assertEqual(tests_to_rebaseline, ['../../../imported/fake/test/path.html'])
         self.assertEqual(tests_results, test_dict)