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

recipe_modules/properties/test_api.py

Index: recipe_modules/properties/test_api.py
diff --git a/recipe_modules/properties/test_api.py b/recipe_modules/properties/test_api.py
index 069efd14d1860bb63f679216abd997f666754454..90780d171dcbc201c4b1531553e6362d3f844a57 100644
--- a/recipe_modules/properties/test_api.py
+++ b/recipe_modules/properties/test_api.py
@@ -85,9 +85,9 @@ class PropertiesTestApi(recipe_test_api.RecipeTestApi):
     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',