add test

parthea · parthea · commit 71810fd5ea71 · 2023-03-07T15:53:49.000Z
diff --git a/google/api_core/path_template.py b/google/api_core/path_template.py
@@ -310,6 +310,7 @@ def transcode(http_options, message=None, **request_kwargs):
                     if message:
                         try:
                             request["body"] = getattr(leftovers, body)
+                            delete_field(leftovers, body)
                         except AttributeError as e:
                             # gapic-generator-python appends underscores to field names
                             # that collide with python keywords.
@@ -319,9 +320,9 @@ def transcode(http_options, message=None, **request_kwargs):
                             # https://github.com/googleapis/python-api-core/issues/227
                             if hasattr(leftovers, body + "_"):
                                 request["body"] = getattr(leftovers, body + "_")
+                                delete_field(leftovers, body + "_")
                             else:
                                 raise e
-                        delete_field(leftovers, body)
                     else:
                         # gapic-generator-python appends underscores to field names
                         # that collide with python keywords.
diff --git a/tests/unit/test_path_template.py b/tests/unit/test_path_template.py
@@ -17,10 +17,20 @@
 import mock
 import pytest
 
+import proto
+
 from google.api import auth_pb2
 from google.api_core import path_template
 
 
+class Breakpoint(proto.Message):
+    name = proto.Field(proto.STRING, number=1)
+
+class SomeMessage(proto.Message):
+    breakpoint_ = proto.Field(Breakpoint, number=1)
+    debuggee_id = proto.Field(proto.STRING, number=2)
+
+
 @pytest.mark.parametrize(
     "tmpl, args, kwargs, expected_result",
     [
@@ -420,6 +430,13 @@ def test_transcode_with_wildcard(
             {"data": {"id": 1, "info": "some info"}, "foo_": "bar"},
             ["post", "/v1/no/template", {"id": 1, "info": "some info"}, {"foo": "bar"}],
         ],
+        # Single field body with reserved keyword, using message where field name has trailing underscore
+        [
+            [["post", "/v1/no/template", "breakpoint"]],
+            SomeMessage(breakpoint_=Breakpoint(name="test"),debuggee_id="test")._pb,
+            {},
+            ["post", "/v1/no/template", Breakpoint(name="test")._pb, SomeMessage(debuggee_id="test")._pb],
+        ],
         [
             [["post", "/v1/no/template", "oauth"]],
             auth_pb2.AuthenticationRule(
