From 67e456e19c1cd5f47c2da8d8ee19465d3dd6eaa6 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Mon, 10 May 2021 23:54:11 +0000 Subject: [PATCH] fix: fix incorrectly referenced exceptions, add missing port to tests --- .../%version/%sub/services/%service/transports/base.py.j2 | 2 +- .../%name_%version/%sub/services/%service/async_client.py.j2 | 2 +- .../tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 index d630c8f023..82ab146438 100644 --- a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 +++ b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 @@ -91,7 +91,7 @@ class {{ service.name }}Transport(metaclass=abc.ABCMeta): {% if method.retry.backoff_multiplier %}multiplier={{ method.retry.backoff_multiplier }},{% endif %} predicate=retries.if_exception_type( {% for ex in method.retry.retryable_exceptions|sort(attribute='__name__') %} - exceptions.{{ ex.__name__ }}, + core_exceptions.{{ ex.__name__ }}, {% endfor %} ), deadline={{ method.timeout }}, diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 index 47ccc596a8..58a7901048 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 @@ -252,7 +252,7 @@ class {{ service.async_client_name }}: {% if method.retry.backoff_multiplier %}multiplier={{ method.retry.backoff_multiplier }},{% endif %} predicate=retries.if_exception_type( {% for ex in method.retry.retryable_exceptions|sort(attribute='__name__') %} - exceptions.{{ ex.__name__ }}, + core_exceptions.{{ ex.__name__ }}, {% endfor %} ), deadline={{ method.timeout }}, diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 3227b7b340..f6ef2fba9b 100644 --- a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -1665,7 +1665,7 @@ def test_{{ service.name|snake_case }}_transport_create_channel_old_api_core(tra {% with host = (service.host|default('localhost', true)) %} create_channel.assert_called_with( - "{{ host }}", + "{{ host }}{% if ":" not in service.host %}:443{% endif %}", credentials=creds, credentials_file=None, quota_project_id="octopus", @@ -1703,7 +1703,7 @@ def test_{{ service.name|snake_case }}_transport_create_channel_user_scopes(tran transport_class(quota_project_id="octopus", scopes=["1", "2"]) create_channel.assert_called_with( - "{{ host }}", + "{{ host }}{% if ":" not in service.host %}:443{% endif %}", credentials=creds, credentials_file=None, quota_project_id="octopus",