googleapis · parthea · Jan 10, 2022 · Jan 3, 2022 · Jan 3, 2022 · Jan 3, 2022
diff --git a/samples/snippets/test_sample_firewall.py b/samples/snippets/test_sample_firewall.py
@@ -24,7 +24,6 @@
     create_firewall_rule,
     delete_firewall_rule,
     get_firewall_rule,
-    list_firewall_rules,
     patch_firewall_priority,
 )
 
@@ -64,14 +63,29 @@ def firewall_rule():
             raise err
 
 
-def test_create_delete():
+@pytest.fixture
+def autodelete_firewall_name():
+    """
+    Provide a name for a firewall rule and then delete the rule.
+    """
     rule_name = "firewall-sample-test-" + uuid.uuid4().hex[:10]
-    create_firewall_rule(PROJECT, rule_name)
-    rule = get_firewall_rule(PROJECT, rule_name)
-    assert rule.name == rule_name
+    yield rule_name
+    try:
+        delete_firewall_rule(PROJECT, rule_name)
+    except google.api_core.exceptions.BadRequest as err:
+        if err.code == 400 and "is not ready" in err.message:
+            # We can ignore this, this is most likely GCE Enforcer removing the rule before us.
+            pass
+        else:
+            # Something else went wrong, let's escalate it.
+            raise err
+
+
+def test_create(autodelete_firewall_name):
+    create_firewall_rule(PROJECT, autodelete_firewall_name)
+    rule = get_firewall_rule(PROJECT, autodelete_firewall_name)
+    assert rule.name == autodelete_firewall_name
     assert "web" in rule.target_tags
-    delete_firewall_rule(PROJECT, rule_name)
-    assert all(rule.name != rule_name for rule in list_firewall_rules(PROJECT))
 
 
 def test_patch_rule(firewall_rule):