Use git cl try-results intead of Rietveld in wpt_expectations_updater.py.

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.
 """
 
 import argparse
 import copy
 import logging
 
 from webkitpy.common.memoized import memoized
 from webkitpy.common.net.git_cl import GitCL
-from webkitpy.common.net.rietveld import Rietveld
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectationLine, TestExpectations
 from webkitpy.w3c.test_parser import TestParser
 
 _log = logging.getLogger(__name__)
 
 MARKER_COMMENT = '# ====== New tests from w3c-test-autoroller added here ======'
 
 
 class WPTExpectationsUpdater(object):
 
     def __init__(self, host):
         self.host = host
         self.finder = WebKitFinder(self.host.filesystem)
 
     def run(self, args=None):
         """Downloads text new baselines and adds test expectations lines."""
         parser = argparse.ArgumentParser(description=__doc__)
         parser.add_argument('-v', '--verbose', action='store_true', help='More verbose logging.')
         args = parser.parse_args(args)
 
         log_level = logging.DEBUG if args.verbose else logging.INFO
         logging.basicConfig(level=log_level, format='%(message)s')
 
         issue_number = self.get_issue_number()
         if issue_number == 'None':
             _log.error('No issue on current branch.')
             return 1
 
-        rietveld = Rietveld(self.host.web)
-        builds = rietveld.latest_try_jobs(issue_number, self._get_try_bots())
+        builds = self.get_latest_try_jobs()
         _log.debug('Latest try jobs: %r', builds)
         if not builds:
             _log.error('No try job information was collected.')
             return 1
 
         # Here we build up a dict of failing test results for all platforms.
         test_expectations = {}
         for build in builds:
             port_results = self.get_failing_results_dict(build)
             test_expectations = self.merge_dicts(test_expectations, port_results)
 
         # And then we merge results for different platforms that had the same results.
         for test_name, platform_result in test_expectations.iteritems():
             # platform_result is a dict mapping platforms to results.
             test_expectations[test_name] = self.merge_same_valued_keys(platform_result)
 
         test_expectations = self.download_text_baselines(test_expectations)
         test_expectation_lines = self.create_line_list(test_expectations)
         self.write_to_test_expectations(test_expectation_lines)
         return 0
 
     def get_issue_number(self):
         """Returns current CL number. Can be replaced in unit tests."""
         return GitCL(self.host).get_issue_number()
 
+    def get_latest_try_jobs(self):
+        """Returns the latest finished try jobs as Build objects."""
+        return GitCL(self.host).latest_try_jobs(self._get_try_bots())
+
     def get_failing_results_dict(self, build):
         """Returns a nested dict of failing test results.
 
         Retrieves a full list of layout test results from a builder result URL.
         Collects the builder name, platform and a list of tests that did not
         run as expected.
 
         Args:
             build: A Build object.
 
@@ skipping 351 matching lines @@
                 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()
 
     def _get_try_bots(self):
         return self.host.builders.all_try_builder_names()