Have presubmit accept various Code-Review label configurations

presubmit_support.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.8.0'
 
@@ skipping 226 matching lines @@
     if 'real_description' not in rev_info:
       rev_info['real_description'] = (
           gerrit_util.GetChangeDescriptionFromGitiles(
               rev_info['fetch']['http']['url'], rev))
     return rev_info['real_description']
 
   def GetChangeOwner(self, issue):
     return self.GetChangeInfo(issue)['owner']['email']
 
   def GetChangeReviewers(self, issue, approving_only=True):
-    # Gerrit has 'approved' sub-section, but it only lists 1 approver.
-    # So, if we look only for approvers, we have to look at all anyway.
-    # Also, assume LGTM means Code-Review label == 2. Other configurations
-    # aren't supported.
+    cr = self.GetChangeInfo(issue)['labels']['Code-Review']
+    max_value = max(int(k) for k in cr['values'].keys())
     return [r['email']
             for r in self.GetChangeInfo(issue)['labels']['Code-Review']['all']

[martiniss, 2016/07/22 21:41:16]

Use cr here?

[agable, 2016/07/22 21:43:40]

Right, fixed.

-            if not approving_only or '2' == str(r.get('value', 0))]
+            if not approving_only or r.get('value', 0) == max_value]
 
 
 class OutputApi(object):
   """An instance of OutputApi gets passed to presubmit scripts so that they
   can output various types of results.
   """
   PresubmitResult = _PresubmitResult
   PresubmitError = _PresubmitError
   PresubmitPromptWarning = _PresubmitPromptWarning
   PresubmitNotifyResult = _PresubmitNotifyResult
@@ skipping 1559 matching lines @@
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(2)