Skip to content

fix: fix presubmit failures due to async tests #2426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

fix: fix presubmit failures due to async tests #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9c58b5
Try to fix fragment (3.13) tests by pinning pytest-asyncio
vchudnov-g Aug 12, 2025
2612994
fix: import and use asyncio for async service test
vchudnov-g Aug 27, 2025
c37eca7
unpin the pytest-asyncio version
vchudnov-g Aug 27, 2025
14c56f9
Update goldens
vchudnov-g Aug 27, 2025
9b182cf
pin mypy
vchudnov-g Aug 27, 2025
2157235
Update goldens
vchudnov-g Aug 28, 2025
67b84ec
Try pinning pytest-asyncio
vchudnov-g Aug 28, 2025
f1a1c82
Update format
vchudnov-g Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gapic/templates/noxfile.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.8", "3.9", "3.10", "3.11", "3.12",
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -81,7 +82,8 @@ nox.options.error_on_missing_interpreters = True
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
5 changes: 3 additions & 2 deletions gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ def test__get_api_endpoint():
{% for method in service.methods.values() %}{% with method_name = method.name|snake_case %}
{% for mode in ["", "async"] %}
{% if mode == "async" %}
@pytest.mark.asyncio
async def test_{{ method_name }}_api_version_header_async(transport_name="grpc"):
client = {{ service.async_client_name }}(credentials=async_anonymous_credentials(), transport=transport_name)
{% else %}
Expand All @@ -247,8 +248,8 @@ def test_{{ method_name }}_api_version_header(transport_name):
# Mock the actual call within the gRPC stub, and fake the request.
with mock.patch.object(
type(client.transport.{{ method.transport_safe_name|snake_case }}),
'__call__'
) as call:
'__call__'{% if mode == "async" %},
new_callable=AsyncMock{% endif %}) as call:
{% if mode == "async" %}
await client.{{ method_name }}()
{% else %}
Expand Down
11 changes: 6 additions & 5 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,9 @@ def showcase(
"""Run the Showcase test suite."""

with showcase_library(session, templates=templates, other_opts=other_opts):
# Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
# Use pytest-asyncio<1.0.0 while we investigate the recent failure described in
# https://github.com/googleapis/gapic-generator-python/issues/2399
session.install("pytest", "pytest-asyncio!=1.0.0")
session.install("pytest", "pytest-asyncio<1.0.0")
test_directory = Path("tests", "system")
ignore_file = env.get("IGNORE_FILE")
pytest_command = [
Expand Down Expand Up @@ -424,9 +424,9 @@ def showcase_w_rest_async(
with showcase_library(
session, templates=templates, other_opts=other_opts, rest_async_io_enabled=True
):
# Exclude pytest-asyncio==1.0.0 while we investigate the recent failure described in
# Use pytest-asyncio<1.0.0 while we investigate the recent failure described in
# https://github.com/googleapis/gapic-generator-python/issues/2399
session.install("pytest", "pytest-asyncio!=1.0.0")
session.install("pytest", "pytest-asyncio<1.0.0")
test_directory = Path("tests", "system")
ignore_file = env.get("IGNORE_FILE")
pytest_command = [
Expand Down Expand Up @@ -589,7 +589,8 @@ def showcase_mypy(
"""Perform typecheck analysis on the generated Showcase library."""

session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-setuptools",
"types-protobuf",
"types-requests",
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/asset/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/credentials/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/eventarc/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/logging/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/logging_internal/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/redis/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/goldens/redis_selective/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
"pytest-asyncio"
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand All @@ -88,7 +89,8 @@
def mypy(session):
"""Run the type checker."""
session.install(
"mypy",
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2410): Use the latest version of mypy
"mypy<1.16.0",
"types-requests",
"types-protobuf",
)
Expand Down
Loading