Fix issue overriding bug properties.test_api.tryserver for Gerrit.

recipe_modules/properties/test_api.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import re
 import urlparse
 
 from recipe_engine import recipe_test_api
 
 class PropertiesTestApi(recipe_test_api.RecipeTestApi):
@@ skipping 67 matching lines @@
       parsed = list(urlparse.urlparse(git_url))
       m = re.match(r'^((\w+)(-\w+)*).googlesource.com$', parsed[1])
       if not m: # pragma: no cover
         raise AssertionError('Can\'t guess gerrit_url from git_url "%s", '
                              'specify it as extra kwarg' % parsed[1])
       parsed[1] = m.group(1) + '-review.googlesource.com'
       gerrit_url = urlparse.urlunparse(parsed[:2] + [''] * len(parsed[2:]))
     assert project
     assert git_url
     assert gerrit_url
-    # Pop old style values from kwargs.
-    patch_issue = int(kwargs.pop('issue', 456789))
-    patch_set = int(kwargs.pop('patchset', 12))
+    # Support old and new style patch{set,issue} specification.
+    patch_issue = int(kwargs.pop('issue', kwargs.pop('patch_issue', 456789)))
+    patch_set = int(kwargs.pop('patchset', kwargs.pop('patch_set', 12)))
     # Note that new Gerrit patch properties all start with 'patch_' prefix.
     ret = self.generic(
         patch_storage='gerrit',
         patch_gerrit_url=gerrit_url,
         patch_project=project,
         patch_branch='master',
         patch_issue=patch_issue,
         patch_set=patch_set,
         patch_repository_url=git_url,
         patch_ref='refs/changes/%2d/%d/%d' % (
@@ skipping 19 matching lines @@
         patchset=1,
         project='chrome',
         repository='',
         requester='commit-bot@chromium.org',
         revision='HEAD',
         rietveld='https://codereview.chromium.org',
         patch_project='chromium',
     )
     ret.properties.update(kwargs)
     return ret