Skip to content

Commit e79a3fb

Browse files
m-strzelczykgcf-owl-bot[bot]parthea
authored andcommitted
test: Making firewall test tolerant of GCE Enforcer. (#162)
* docs(samples): Making firewall test tolerant of GCE Enforcer. * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * docs(samples): Marking the default values test as flaky. Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent a237914 commit e79a3fb

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
pytest==6.2.5
2+
flaky==3.7.0
23
google-cloud-storage==1.43.0

compute/compute/snippets/test_sample_default_values.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import typing
1616
import uuid
1717

18+
from flaky import flaky
1819
import google.auth
1920
import google.cloud.storage as storage
2021
import pytest
@@ -38,6 +39,7 @@ def temp_bucket():
3839
bucket.delete(force=True)
3940

4041

42+
@flaky(max_runs=3)
4143
def test_set_usage_export_bucket_default(
4244
capsys: typing.Any, temp_bucket: storage.Bucket
4345
) -> None:

compute/compute/snippets/test_sample_firewall.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import time
1515
import uuid
1616

17+
import google.api_core.exceptions
1718
import google.auth
1819
from google.cloud import compute_v1
1920
import pytest
@@ -52,8 +53,15 @@ def firewall_rule():
5253

5354
yield firewall_client.get(project=PROJECT, firewall=firewall_rule.name)
5455

55-
op = firewall_client.delete(project=PROJECT, firewall=firewall_rule.name)
56-
op_client.wait(project=PROJECT, operation=op.name)
56+
try:
57+
op = firewall_client.delete(project=PROJECT, firewall=firewall_rule.name)
58+
op_client.wait(project=PROJECT, operation=op.name)
59+
except google.api_core.exceptions.BadRequest as err:
60+
if err.code == 400 and "is not ready" in err.message:
61+
# This means GCE enforcer has already deleted that rule.
62+
pass
63+
else:
64+
raise err
5765

5866

5967
def test_create_delete():

0 commit comments

Comments
 (0)