Skip to content

fix: making tests more resistant to concurent running tests #11842

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

Merged
merged 1 commit into from
Jun 17, 2024
Merged

fix: making tests more resistant to concurent running tests #11842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions iam/cloud-client/snippets/test_roles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import re

import backoff
from google.api_core.exceptions import Aborted, InvalidArgument
import google.auth
from google.cloud.iam_admin_v1 import GetRoleRequest, IAMClient, ListRolesRequest, Role
import pytest
Expand Down Expand Up @@ -67,6 +69,7 @@ def test_list_roles(capsys: "pytest.CaptureFixture[str]", iam_role: str) -> None
assert re.search(iam_role, out)


@backoff.on_exception(backoff.expo, Aborted, max_tries=3)
def test_edit_role(iam_role: str) -> None:
client = IAMClient()
name = f"projects/{PROJECT}/roles/{iam_role}"
Expand All @@ -79,6 +82,7 @@ def test_edit_role(iam_role: str) -> None:
assert updated_role.title == title


@backoff.on_exception(backoff.expo, InvalidArgument, max_tries=3)
def test_disable_role(capsys: "pytest.CaptureFixture[str]", iam_role: str) -> None:
disable_role(PROJECT, iam_role)
client = IAMClient()
Expand Down
6 changes: 3 additions & 3 deletions iam/cloud-client/snippets/test_service_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import uuid

import backoff
from google.api_core.exceptions import InvalidArgument
from google.api_core.exceptions import InvalidArgument, NotFound
import google.auth
from google.iam.v1 import policy_pb2
import pytest
Expand Down Expand Up @@ -92,7 +92,7 @@ def test_service_account_set_policy(service_account: str) -> None:

try:
new_policy = set_service_account_iam_policy(PROJECT, service_account, policy)
except InvalidArgument:
except (InvalidArgument, NotFound):
pytest.skip("Service account was removed from outside, skipping")

binding_found = False
Expand All @@ -108,7 +108,7 @@ def test_service_account_rename(service_account: str) -> None:
new_name = "New Name"
try:
account = rename_service_account(PROJECT, service_account, new_name)
except InvalidArgument:
except (InvalidArgument, NotFound):
pytest.skip("Service account was removed from outside, skipping")

assert account.display_name == new_name