Skip to content

Commit 4f307e8

Browse files
m-strzelczykgcf-owl-bot[bot]
authored andcommitted
chore(samples): Removing some leaked instances. (#179)
* chore(samples): Removing some leaked instances. * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(samples): Removing more leaked instances. * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(samples): Removing cleanup code, leaving only the firewall test fix. * chore(samples): Restructuring firewall test. Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 90e7fd5 commit 4f307e8

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

compute/compute/snippets/test_sample_firewall.py

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
create_firewall_rule,
2525
delete_firewall_rule,
2626
get_firewall_rule,
27-
list_firewall_rules,
2827
patch_firewall_priority,
2928
)
3029

@@ -64,14 +63,29 @@ def firewall_rule():
6463
raise err
6564

6665

67-
def test_create_delete():
66+
@pytest.fixture
67+
def autodelete_firewall_name():
68+
"""
69+
Provide a name for a firewall rule and then delete the rule.
70+
"""
6871
rule_name = "firewall-sample-test-" + uuid.uuid4().hex[:10]
69-
create_firewall_rule(PROJECT, rule_name)
70-
rule = get_firewall_rule(PROJECT, rule_name)
71-
assert rule.name == rule_name
72+
yield rule_name
73+
try:
74+
delete_firewall_rule(PROJECT, rule_name)
75+
except google.api_core.exceptions.BadRequest as err:
76+
if err.code == 400 and "is not ready" in err.message:
77+
# We can ignore this, this is most likely GCE Enforcer removing the rule before us.
78+
pass
79+
else:
80+
# Something else went wrong, let's escalate it.
81+
raise err
82+
83+
84+
def test_create(autodelete_firewall_name):
85+
create_firewall_rule(PROJECT, autodelete_firewall_name)
86+
rule = get_firewall_rule(PROJECT, autodelete_firewall_name)
87+
assert rule.name == autodelete_firewall_name
7288
assert "web" in rule.target_tags
73-
delete_firewall_rule(PROJECT, rule_name)
74-
assert all(rule.name != rule_name for rule in list_firewall_rules(PROJECT))
7589

7690

7791
def test_patch_rule(firewall_rule):

0 commit comments

Comments
 (0)