Make new bugdroid recognize git footer Bug: 123.

infra/services/bugdroid/log_parser.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.
 
 """Utility functions to extract information from commit log data."""
 
 import re
 from collections import defaultdict
 
 
 BUG_LINE_REGEX = re.compile(
-    r'(?m)^(?P<flag>[>\s]*(?:BUGS?|ISSUE) *[ :=] *)(?P<data>.*)$')
+    r'(?m)^(?P<flag>[>\s]*(?:BUGS?|ISSUE|Bugs?) *[ :=] *)(?P<data>.*)$')
 
 PROJECT_NAME_REGEX = r'(?P<project>[a-z0-9][-a-z0-9]*[a-z0-9])'
 BUG_NUMBER_REGEX = r'(?P<bugnum>[0-9]+)'
 
 SHORTFORM_REGEX = r'(?:%s:)?#?%s' % (
     PROJECT_NAME_REGEX, BUG_NUMBER_REGEX)
 CRBUG_REGEX = r'(?:https?://)?crbug\.com/(%s/)?%s' % (
     PROJECT_NAME_REGEX, BUG_NUMBER_REGEX)
 MONORAIL_REGEX = r'(?:https?://)?bugs\.chromium\.org/p/%s/[^?]+\?id=%s' % (
     PROJECT_NAME_REGEX, BUG_NUMBER_REGEX)
 CODESITE_REGEX = '(?:https?://)?code\.google\.com/p/%s/[^?]+\?id=%s' % (
     PROJECT_NAME_REGEX, BUG_NUMBER_REGEX)
 
 REGEXES = [
     re.compile(SHORTFORM_REGEX),
     re.compile(CRBUG_REGEX),
     re.compile(MONORAIL_REGEX),
     re.compile(CODESITE_REGEX),
 ]
 
 
-def normalize_project_name(project):
+def normalize_project_name(project): # pragma: no cover
   """Return the canonical name for a project specification."""
   mapping = {
       'nacl': 'nativeclient',
       'cros': 'chromium-os',
       }
   return mapping.get(project, project)
 
 
-def get_issues(log_entry, default_project):
+def get_issues(log_entry, default_project): # pragma: no cover
   """Extract bug #'s from a SCM commit log message.
 
   Args:
     log_entry: The commit log_entry to search for bug #'s.
     default_project: If a bug doesn't have an project specifier (e.g. foo:123),
       then assume it belongs in this project.
 
   Returns:
     Dictionary of {'project': [list, of, bug, numbers]}.
 
@@ skipping 47 matching lines @@
         bugproject = m.groupdict().get('project') or line_project
         bugproject = normalize_project_name(bugproject)
         bugnum = m.groupdict().get('bugnum')
         # Only check for None, since empty project name is the default.
         bug_dict[bugproject].add(bugnum)
         line_project = bugproject
 
   rtn = {proj: sorted([int(b.strip()) for b in bugs])
          for proj, bugs in bug_dict.iteritems()}
   return rtn