revert change to test service

hebaalazzeh · hebaalazzeh · commit c892809c49ad · 2026-07-24T18:41:58.000Z
diff --git a/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
@@ -2,11 +2,15 @@
 {% block content %}
 {# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove the following variable (and the condition later in this file) for async rest transport once support for it is GA. #}
 {% set rest_async_io_enabled = api.all_library_settings[api.naming.proto_package].python_settings.experimental_features.rest_async_io_enabled %}
+{% set has_auto_populated_fields = api.all_method_settings.values()|map(attribute="auto_populated_fields", default=[])|select|list %}
 {% import "tests/unit/gapic/%name_%version/%sub/test_macros.j2" as test_macros %}
 {% import "%namespace/%name_%version/%sub/services/%service/_shared_macros.j2" as shared_macros %}
 
 import os
 import asyncio
+{% if has_auto_populated_fields %}
+import re
+{% endif %}
 from unittest import mock
 from unittest.mock import AsyncMock
 
@@ -103,7 +107,9 @@ CRED_INFO_JSON = {
     "principal": "service-account@example.com",
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
-
+{% if has_auto_populated_fields %}
+_UUID4_RE = re.compile(r"{{ uuid4_re }}")
+{% endif %}
 
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
diff --git a/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py b/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py
@@ -77,7 +77,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py b/packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_iam_credentials.py
@@ -67,7 +67,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -98,7 +98,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py
@@ -68,7 +68,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py
@@ -69,7 +69,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
@@ -67,7 +67,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py
@@ -68,7 +68,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py
@@ -69,7 +69,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
@@ -67,7 +67,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py
@@ -85,7 +85,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py
@@ -85,7 +85,6 @@
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
 
-
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER
         chunk = data[i : i + chunk_size]
diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py
@@ -15,6 +15,7 @@
 #
 import os
 import asyncio
+import re
 from unittest import mock
 from unittest.mock import AsyncMock
 
@@ -74,7 +75,7 @@
     "principal": "service-account@example.com",
 }
 CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)
-
+_UUID4_RE = re.compile(r"[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}")
 
 async def mock_async_gen(data, chunk_size=1):
     for i in range(0, len(data)):  # pragma: NO COVER

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@`
`77`	`77`	`}`
`78`	`78`	`CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)`
`79`	`79`
`80`		`-`
`81`	`80`	`async def mock_async_gen(data, chunk_size=1):`
`82`	`81`	`for i in range(0, len(data)): # pragma: NO COVER`
`83`	`82`	`chunk = data[i : i + chunk_size]`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@`
`67`	`67`	`}`
`68`	`68`	`CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)`
`69`	`69`
`70`		`-`
`71`	`70`	`async def mock_async_gen(data, chunk_size=1):`
`72`	`71`	`for i in range(0, len(data)): # pragma: NO COVER`
`73`	`72`	`chunk = data[i : i + chunk_size]`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@`
`98`	`98`	`}`
`99`	`99`	`CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)`
`100`	`100`
`101`		`-`
`102`	`101`	`async def mock_async_gen(data, chunk_size=1):`
`103`	`102`	`for i in range(0, len(data)): # pragma: NO COVER`
`104`	`103`	`chunk = data[i : i + chunk_size]`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@`
`68`	`68`	`}`
`69`	`69`	`CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)`
`70`	`70`
`71`		`-`
`72`	`71`	`async def mock_async_gen(data, chunk_size=1):`
`73`	`72`	`for i in range(0, len(data)): # pragma: NO COVER`
`74`	`73`	`chunk = data[i : i + chunk_size]`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@`
`69`	`69`	`}`
`70`	`70`	`CRED_INFO_STRING = json.dumps(CRED_INFO_JSON)`
`71`	`71`
`72`		`-`
`73`	`72`	`async def mock_async_gen(data, chunk_size=1):`
`74`	`73`	`for i in range(0, len(data)): # pragma: NO COVER`
`75`	`74`	`chunk = data[i : i + chunk_size]`