Skip to content

Commit b1f8440

Browse files
daniel-sanchedaniel-sanche
authored
chore: fix AwaitableMock test coverage (#2050)
1 parent 148d272 commit b1f8440

File tree

8 files changed

+100
-500
lines changed

8 files changed

+100
-500
lines changed

‎packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,7 @@ async def test_{{ method_name }}_async_use_cached_wrapped_rpc(transport: str = "
321321
assert client._client._transport.{{method.transport_safe_name|snake_case}} in client._client._transport._wrapped_methods
322322

323323
# Replace cached wrapped function with mock
324-
class AwaitableMock(mock.AsyncMock):
325-
def __await__(self):
326-
self.await_count += 1
327-
return iter([])
328-
mock_object = AwaitableMock()
324+
mock_object = mock.AsyncMock()
329325
client._client._transport._wrapped_methods[client._client._transport.{{method.transport_safe_name|snake_case}}] = mock_object
330326

331327
{% if method.client_streaming %}

‎packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py‎

Lines changed: 23 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -923,11 +923,7 @@ async def test_export_assets_async_use_cached_wrapped_rpc(transport: str = "grpc
923923
assert client._client._transport.export_assets in client._client._transport._wrapped_methods
924924

925925
# Replace cached wrapped function with mock
926-
class AwaitableMock(mock.AsyncMock):
927-
def __await__(self):
928-
self.await_count += 1
929-
return iter([])
930-
mock_object = AwaitableMock()
926+
mock_object = mock.AsyncMock()
931927
client._client._transport._wrapped_methods[client._client._transport.export_assets] = mock_object
932928

933929
request = {}
@@ -1200,11 +1196,7 @@ async def test_list_assets_async_use_cached_wrapped_rpc(transport: str = "grpc_a
12001196
assert client._client._transport.list_assets in client._client._transport._wrapped_methods
12011197

12021198
# Replace cached wrapped function with mock
1203-
class AwaitableMock(mock.AsyncMock):
1204-
def __await__(self):
1205-
self.await_count += 1
1206-
return iter([])
1207-
mock_object = AwaitableMock()
1199+
mock_object = mock.AsyncMock()
12081200
client._client._transport._wrapped_methods[client._client._transport.list_assets] = mock_object
12091201

12101202
request = {}
@@ -1743,11 +1735,7 @@ async def test_batch_get_assets_history_async_use_cached_wrapped_rpc(transport:
17431735
assert client._client._transport.batch_get_assets_history in client._client._transport._wrapped_methods
17441736

17451737
# Replace cached wrapped function with mock
1746-
class AwaitableMock(mock.AsyncMock):
1747-
def __await__(self):
1748-
self.await_count += 1
1749-
return iter([])
1750-
mock_object = AwaitableMock()
1738+
mock_object = mock.AsyncMock()
17511739
client._client._transport._wrapped_methods[client._client._transport.batch_get_assets_history] = mock_object
17521740

17531741
request = {}
@@ -2027,11 +2015,7 @@ async def test_create_feed_async_use_cached_wrapped_rpc(transport: str = "grpc_a
20272015
assert client._client._transport.create_feed in client._client._transport._wrapped_methods
20282016

20292017
# Replace cached wrapped function with mock
2030-
class AwaitableMock(mock.AsyncMock):
2031-
def __await__(self):
2032-
self.await_count += 1
2033-
return iter([])
2034-
mock_object = AwaitableMock()
2018+
mock_object = mock.AsyncMock()
20352019
client._client._transport._wrapped_methods[client._client._transport.create_feed] = mock_object
20362020

20372021
request = {}
@@ -2401,11 +2385,7 @@ async def test_get_feed_async_use_cached_wrapped_rpc(transport: str = "grpc_asyn
24012385
assert client._client._transport.get_feed in client._client._transport._wrapped_methods
24022386

24032387
# Replace cached wrapped function with mock
2404-
class AwaitableMock(mock.AsyncMock):
2405-
def __await__(self):
2406-
self.await_count += 1
2407-
return iter([])
2408-
mock_object = AwaitableMock()
2388+
mock_object = mock.AsyncMock()
24092389
client._client._transport._wrapped_methods[client._client._transport.get_feed] = mock_object
24102390

24112391
request = {}
@@ -2760,11 +2740,7 @@ async def test_list_feeds_async_use_cached_wrapped_rpc(transport: str = "grpc_as
27602740
assert client._client._transport.list_feeds in client._client._transport._wrapped_methods
27612741

27622742
# Replace cached wrapped function with mock
2763-
class AwaitableMock(mock.AsyncMock):
2764-
def __await__(self):
2765-
self.await_count += 1
2766-
return iter([])
2767-
mock_object = AwaitableMock()
2743+
mock_object = mock.AsyncMock()
27682744
client._client._transport._wrapped_methods[client._client._transport.list_feeds] = mock_object
27692745

27702746
request = {}
@@ -3122,11 +3098,7 @@ async def test_update_feed_async_use_cached_wrapped_rpc(transport: str = "grpc_a
31223098
assert client._client._transport.update_feed in client._client._transport._wrapped_methods
31233099

31243100
# Replace cached wrapped function with mock
3125-
class AwaitableMock(mock.AsyncMock):
3126-
def __await__(self):
3127-
self.await_count += 1
3128-
return iter([])
3129-
mock_object = AwaitableMock()
3101+
mock_object = mock.AsyncMock()
31303102
client._client._transport._wrapped_methods[client._client._transport.update_feed] = mock_object
31313103

31323104
request = {}
@@ -3479,11 +3451,7 @@ async def test_delete_feed_async_use_cached_wrapped_rpc(transport: str = "grpc_a
34793451
assert client._client._transport.delete_feed in client._client._transport._wrapped_methods
34803452

34813453
# Replace cached wrapped function with mock
3482-
class AwaitableMock(mock.AsyncMock):
3483-
def __await__(self):
3484-
self.await_count += 1
3485-
return iter([])
3486-
mock_object = AwaitableMock()
3454+
mock_object = mock.AsyncMock()
34873455
client._client._transport._wrapped_methods[client._client._transport.delete_feed] = mock_object
34883456

34893457
request = {}
@@ -3836,11 +3804,7 @@ async def test_search_all_resources_async_use_cached_wrapped_rpc(transport: str
38363804
assert client._client._transport.search_all_resources in client._client._transport._wrapped_methods
38373805

38383806
# Replace cached wrapped function with mock
3839-
class AwaitableMock(mock.AsyncMock):
3840-
def __await__(self):
3841-
self.await_count += 1
3842-
return iter([])
3843-
mock_object = AwaitableMock()
3807+
mock_object = mock.AsyncMock()
38443808
client._client._transport._wrapped_methods[client._client._transport.search_all_resources] = mock_object
38453809

38463810
request = {}
@@ -4408,11 +4372,7 @@ async def test_search_all_iam_policies_async_use_cached_wrapped_rpc(transport: s
44084372
assert client._client._transport.search_all_iam_policies in client._client._transport._wrapped_methods
44094373

44104374
# Replace cached wrapped function with mock
4411-
class AwaitableMock(mock.AsyncMock):
4412-
def __await__(self):
4413-
self.await_count += 1
4414-
return iter([])
4415-
mock_object = AwaitableMock()
4375+
mock_object = mock.AsyncMock()
44164376
client._client._transport._wrapped_methods[client._client._transport.search_all_iam_policies] = mock_object
44174377

44184378
request = {}
@@ -4964,11 +4924,7 @@ async def test_analyze_iam_policy_async_use_cached_wrapped_rpc(transport: str =
49644924
assert client._client._transport.analyze_iam_policy in client._client._transport._wrapped_methods
49654925

49664926
# Replace cached wrapped function with mock
4967-
class AwaitableMock(mock.AsyncMock):
4968-
def __await__(self):
4969-
self.await_count += 1
4970-
return iter([])
4971-
mock_object = AwaitableMock()
4927+
mock_object = mock.AsyncMock()
49724928
client._client._transport._wrapped_methods[client._client._transport.analyze_iam_policy] = mock_object
49734929

49744930
request = {}
@@ -5237,11 +5193,7 @@ async def test_analyze_iam_policy_longrunning_async_use_cached_wrapped_rpc(trans
52375193
assert client._client._transport.analyze_iam_policy_longrunning in client._client._transport._wrapped_methods
52385194

52395195
# Replace cached wrapped function with mock
5240-
class AwaitableMock(mock.AsyncMock):
5241-
def __await__(self):
5242-
self.await_count += 1
5243-
return iter([])
5244-
mock_object = AwaitableMock()
5196+
mock_object = mock.AsyncMock()
52455197
client._client._transport._wrapped_methods[client._client._transport.analyze_iam_policy_longrunning] = mock_object
52465198

52475199
request = {}
@@ -5511,11 +5463,7 @@ async def test_analyze_move_async_use_cached_wrapped_rpc(transport: str = "grpc_
55115463
assert client._client._transport.analyze_move in client._client._transport._wrapped_methods
55125464

55135465
# Replace cached wrapped function with mock
5514-
class AwaitableMock(mock.AsyncMock):
5515-
def __await__(self):
5516-
self.await_count += 1
5517-
return iter([])
5518-
mock_object = AwaitableMock()
5466+
mock_object = mock.AsyncMock()
55195467
client._client._transport._wrapped_methods[client._client._transport.analyze_move] = mock_object
55205468

55215469
request = {}
@@ -5790,11 +5738,7 @@ async def test_query_assets_async_use_cached_wrapped_rpc(transport: str = "grpc_
57905738
assert client._client._transport.query_assets in client._client._transport._wrapped_methods
57915739

57925740
# Replace cached wrapped function with mock
5793-
class AwaitableMock(mock.AsyncMock):
5794-
def __await__(self):
5795-
self.await_count += 1
5796-
return iter([])
5797-
mock_object = AwaitableMock()
5741+
mock_object = mock.AsyncMock()
57985742
client._client._transport._wrapped_methods[client._client._transport.query_assets] = mock_object
57995743

58005744
request = {}
@@ -6075,11 +6019,7 @@ async def test_create_saved_query_async_use_cached_wrapped_rpc(transport: str =
60756019
assert client._client._transport.create_saved_query in client._client._transport._wrapped_methods
60766020

60776021
# Replace cached wrapped function with mock
6078-
class AwaitableMock(mock.AsyncMock):
6079-
def __await__(self):
6080-
self.await_count += 1
6081-
return iter([])
6082-
mock_object = AwaitableMock()
6022+
mock_object = mock.AsyncMock()
60836023
client._client._transport._wrapped_methods[client._client._transport.create_saved_query] = mock_object
60846024

60856025
request = {}
@@ -6464,11 +6404,7 @@ async def test_get_saved_query_async_use_cached_wrapped_rpc(transport: str = "gr
64646404
assert client._client._transport.get_saved_query in client._client._transport._wrapped_methods
64656405

64666406
# Replace cached wrapped function with mock
6467-
class AwaitableMock(mock.AsyncMock):
6468-
def __await__(self):
6469-
self.await_count += 1
6470-
return iter([])
6471-
mock_object = AwaitableMock()
6407+
mock_object = mock.AsyncMock()
64726408
client._client._transport._wrapped_methods[client._client._transport.get_saved_query] = mock_object
64736409

64746410
request = {}
@@ -6828,11 +6764,7 @@ async def test_list_saved_queries_async_use_cached_wrapped_rpc(transport: str =
68286764
assert client._client._transport.list_saved_queries in client._client._transport._wrapped_methods
68296765

68306766
# Replace cached wrapped function with mock
6831-
class AwaitableMock(mock.AsyncMock):
6832-
def __await__(self):
6833-
self.await_count += 1
6834-
return iter([])
6835-
mock_object = AwaitableMock()
6767+
mock_object = mock.AsyncMock()
68366768
client._client._transport._wrapped_methods[client._client._transport.list_saved_queries] = mock_object
68376769

68386770
request = {}
@@ -7381,11 +7313,7 @@ async def test_update_saved_query_async_use_cached_wrapped_rpc(transport: str =
73817313
assert client._client._transport.update_saved_query in client._client._transport._wrapped_methods
73827314

73837315
# Replace cached wrapped function with mock
7384-
class AwaitableMock(mock.AsyncMock):
7385-
def __await__(self):
7386-
self.await_count += 1
7387-
return iter([])
7388-
mock_object = AwaitableMock()
7316+
mock_object = mock.AsyncMock()
73897317
client._client._transport._wrapped_methods[client._client._transport.update_saved_query] = mock_object
73907318

73917319
request = {}
@@ -7746,11 +7674,7 @@ async def test_delete_saved_query_async_use_cached_wrapped_rpc(transport: str =
77467674
assert client._client._transport.delete_saved_query in client._client._transport._wrapped_methods
77477675

77487676
# Replace cached wrapped function with mock
7749-
class AwaitableMock(mock.AsyncMock):
7750-
def __await__(self):
7751-
self.await_count += 1
7752-
return iter([])
7753-
mock_object = AwaitableMock()
7677+
mock_object = mock.AsyncMock()
77547678
client._client._transport._wrapped_methods[client._client._transport.delete_saved_query] = mock_object
77557679

77567680
request = {}
@@ -8094,11 +8018,7 @@ async def test_batch_get_effective_iam_policies_async_use_cached_wrapped_rpc(tra
80948018
assert client._client._transport.batch_get_effective_iam_policies in client._client._transport._wrapped_methods
80958019

80968020
# Replace cached wrapped function with mock
8097-
class AwaitableMock(mock.AsyncMock):
8098-
def __await__(self):
8099-
self.await_count += 1
8100-
return iter([])
8101-
mock_object = AwaitableMock()
8021+
mock_object = mock.AsyncMock()
81028022
client._client._transport._wrapped_methods[client._client._transport.batch_get_effective_iam_policies] = mock_object
81038023

81048024
request = {}
@@ -8370,11 +8290,7 @@ async def test_analyze_org_policies_async_use_cached_wrapped_rpc(transport: str
83708290
assert client._client._transport.analyze_org_policies in client._client._transport._wrapped_methods
83718291

83728292
# Replace cached wrapped function with mock
8373-
class AwaitableMock(mock.AsyncMock):
8374-
def __await__(self):
8375-
self.await_count += 1
8376-
return iter([])
8377-
mock_object = AwaitableMock()
8293+
mock_object = mock.AsyncMock()
83788294
client._client._transport._wrapped_methods[client._client._transport.analyze_org_policies] = mock_object
83798295

83808296
request = {}
@@ -8942,11 +8858,7 @@ async def test_analyze_org_policy_governed_containers_async_use_cached_wrapped_r
89428858
assert client._client._transport.analyze_org_policy_governed_containers in client._client._transport._wrapped_methods
89438859

89448860
# Replace cached wrapped function with mock
8945-
class AwaitableMock(mock.AsyncMock):
8946-
def __await__(self):
8947-
self.await_count += 1
8948-
return iter([])
8949-
mock_object = AwaitableMock()
8861+
mock_object = mock.AsyncMock()
89508862
client._client._transport._wrapped_methods[client._client._transport.analyze_org_policy_governed_containers] = mock_object
89518863

89528864
request = {}
@@ -9514,11 +9426,7 @@ async def test_analyze_org_policy_governed_assets_async_use_cached_wrapped_rpc(t
95149426
assert client._client._transport.analyze_org_policy_governed_assets in client._client._transport._wrapped_methods
95159427

95169428
# Replace cached wrapped function with mock
9517-
class AwaitableMock(mock.AsyncMock):
9518-
def __await__(self):
9519-
self.await_count += 1
9520-
return iter([])
9521-
mock_object = AwaitableMock()
9429+
mock_object = mock.AsyncMock()
95229430
client._client._transport._wrapped_methods[client._client._transport.analyze_org_policy_governed_assets] = mock_object
95239431

95249432
request = {}

‎packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -912,11 +912,7 @@ async def test_generate_access_token_async_use_cached_wrapped_rpc(transport: str
912912
assert client._client._transport.generate_access_token in client._client._transport._wrapped_methods
913913

914914
# Replace cached wrapped function with mock
915-
class AwaitableMock(mock.AsyncMock):
916-
def __await__(self):
917-
self.await_count += 1
918-
return iter([])
919-
mock_object = AwaitableMock()
915+
mock_object = mock.AsyncMock()
920916
client._client._transport._wrapped_methods[client._client._transport.generate_access_token] = mock_object
921917

922918
request = {}
@@ -1294,11 +1290,7 @@ async def test_generate_id_token_async_use_cached_wrapped_rpc(transport: str = "
12941290
assert client._client._transport.generate_id_token in client._client._transport._wrapped_methods
12951291

12961292
# Replace cached wrapped function with mock
1297-
class AwaitableMock(mock.AsyncMock):
1298-
def __await__(self):
1299-
self.await_count += 1
1300-
return iter([])
1301-
mock_object = AwaitableMock()
1293+
mock_object = mock.AsyncMock()
13021294
client._client._transport._wrapped_methods[client._client._transport.generate_id_token] = mock_object
13031295

13041296
request = {}
@@ -1681,11 +1673,7 @@ async def test_sign_blob_async_use_cached_wrapped_rpc(transport: str = "grpc_asy
16811673
assert client._client._transport.sign_blob in client._client._transport._wrapped_methods
16821674

16831675
# Replace cached wrapped function with mock
1684-
class AwaitableMock(mock.AsyncMock):
1685-
def __await__(self):
1686-
self.await_count += 1
1687-
return iter([])
1688-
mock_object = AwaitableMock()
1676+
mock_object = mock.AsyncMock()
16891677
client._client._transport._wrapped_methods[client._client._transport.sign_blob] = mock_object
16901678

16911679
request = {}
@@ -2062,11 +2050,7 @@ async def test_sign_jwt_async_use_cached_wrapped_rpc(transport: str = "grpc_asyn
20622050
assert client._client._transport.sign_jwt in client._client._transport._wrapped_methods
20632051

20642052
# Replace cached wrapped function with mock
2065-
class AwaitableMock(mock.AsyncMock):
2066-
def __await__(self):
2067-
self.await_count += 1
2068-
return iter([])
2069-
mock_object = AwaitableMock()
2053+
mock_object = mock.AsyncMock()
20702054
client._client._transport._wrapped_methods[client._client._transport.sign_jwt] = mock_object
20712055

20722056
request = {}

0 commit comments

Comments
 (0)