Add --help and --verbose options to update-w3c-test-expectations.

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.
 
 This is used as part of the w3c test auto-import process.
 """
 
+import argparse
 import logging
 
-from webkitpy.common.net.buildbot import BuildBot, Build
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.net.rietveld import Rietveld
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.w3c.test_parser import TestParser
 
 _log = logging.getLogger(__name__)
 
 
 class W3CExpectationsLineAdder(object):
 
     def __init__(self, host):
         self.host = host
         self.host.initialize_scm()
         self.finder = WebKitFinder(self.host.filesystem)
 
-    def run(self):
+    def run(self, args=None):
+        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
+
         try_bots = self.get_try_bots()
         rietveld = Rietveld(self.host.web)
         try_jobs = rietveld.latest_try_jobs(issue_number, try_bots)
+        _log.debug('Latest try jobs: %r', try_jobs)
 
         if not try_jobs:
-            print 'No Try Job information was collected.'
+            _log.error('No try job information was collected.')
             return 1
 
         test_expectations = {}
         for job in try_jobs:
             platform_results = self.get_failing_results_dict(job)
             test_expectations = self.merge_dicts(test_expectations, platform_results)
 
         for test_name, platform_result in test_expectations.iteritems():
             test_expectations[test_name] = self.merge_same_valued_keys(platform_result)
 
@@ skipping 198 matching lines @@
         Writes the test expectations lines in |line_list| to the test
         expectations file.
 
         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 w3c test expectations lines.
         """
+        _log.debug('Lines to write to TestExpectations: %r', line_list)
         port = self.host.port_factory.get()
         expectations_file = port.path_to_generic_test_expectations_file()
         comment_line = '# Tests added from W3C auto import bot'
         file_contents = self.host.filesystem.read_text_file(expectations_file)
         w3c_comment_line_index = file_contents.find(comment_line)
         all_lines = ''
         for line in line_list:
             end_bracket_index = line.split().index(']')
             test_name = line.split()[end_bracket_index + 1]
             if test_name in file_contents:
@@ skipping 20 matching lines @@
         Args:
             tests_results: A dict mapping test name to platform to test results.
 
         Returns:
             An updated tests_results dictionary without the platform-specific
             testharness.js tests that required new baselines to be downloaded
             from `webkit-patch rebaseline-from-try-jobs`.
         """
         modified_files = self.host.executive.run_command(['git', 'diff', 'origin/master', '--name-only']).splitlines()
         tests_to_rebaseline, tests_results = self.get_tests_to_rebaseline(modified_files, tests_results)
+        _log.debug('Tests to rebaseline: %r', tests_to_rebaseline)
         if tests_to_rebaseline:
             webkit_patch = self.host.filesystem.join(
                 self.finder.chromium_base(), self.finder.webkit_base(), self.finder.path_to_script('webkit-patch'))
             self.host.executive.run_command([
                 'python',
                 webkit_patch,
                 'rebaseline-cl',
                 '--verbose',
                 '--no-trigger-jobs',
                 '--only-changed-tests',
@@ skipping 35 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()