Skip to content

Commit bd261c9

Browse files
committed
Add try-except clause to create_image_id fixture
1 parent 265d3d3 commit bd261c9

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

test/integration/models/sharegroups/test_sharegroups.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import pytest
66

7+
from linode_api4.errors import ApiError
78
from linode_api4.objects import (
89
Image,
910
ImageShareGroup,
@@ -33,7 +34,7 @@ def wait_for_image_status(
3334
)
3435

3536

36-
@pytest.fixture(scope="class")
37+
@pytest.fixture(scope="module")
3738
def sample_linode(test_linode_client, e2e_test_firewall):
3839
client = test_linode_client
3940
region = get_region(client, {"Linodes", "Cloud Firewall"}, site_type="core")
@@ -50,15 +51,22 @@ def sample_linode(test_linode_client, e2e_test_firewall):
5051
linode_instance.delete()
5152

5253

53-
@pytest.fixture(scope="class")
54+
@pytest.fixture(scope="module")
5455
def create_image_id(test_linode_client, sample_linode):
5556
create_image = test_linode_client.images.create(
5657
sample_linode.disks[0],
5758
label="linode-api4python-test-image-sharing-image",
5859
)
5960
wait_for_image_status(test_linode_client, create_image.id, "available")
61+
6062
yield create_image.id
61-
create_image.delete()
63+
64+
try:
65+
create_image.delete()
66+
except ApiError as e:
67+
# The image may already have been removed so we ignore [404] Not found
68+
if e.status != 404:
69+
raise
6270

6371

6472
@pytest.fixture(scope="function")

0 commit comments

Comments
 (0)