Skip to content

Commit 68772a8

Browse files
authored
Update Images in integration tests (#694)
* update images * fix lint
1 parent 8985109 commit 68772a8

4 files changed

Lines changed: 8 additions & 18 deletions

File tree

linode_api4/objects/database.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
from dataclasses import dataclass, field
22
from typing import Optional
33

4-
from linode_api4.objects import (
5-
Base,
6-
JSONObject,
7-
MappedObject,
8-
Property,
9-
)
4+
from linode_api4.objects import Base, JSONObject, MappedObject, Property
105

116

127
class DatabaseType(Base):

test/integration/linode_client/test_linode_client.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,9 @@ def test_fails_to_create_image_with_non_existing_disk_id(
116116
disk_id = 111111
117117

118118
try:
119-
image_page = client.image_create(
120-
disk=disk_id, label=label, description=description
121-
)
119+
client.image_create(disk=disk_id, label=label, description=description)
122120
except ApiError as e:
123-
assert "Not found" in str(e.json)
124-
assert e.status == 404
121+
assert 400 <= e.status < 500
125122

126123

127124
def test_fails_to_delete_predefined_images(setup_client_and_linode):

test/integration/models/linode/test_linode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def linode_for_disk_tests(test_linode_client, e2e_test_firewall):
141141
linode_instance, password = client.linode.instance_create(
142142
"g6-nanode-1",
143143
region,
144-
image="linode/alpine3.19",
144+
image="linode/ubuntu24.04",
145145
label=label + "_long_tests",
146146
firewall=e2e_test_firewall,
147147
)
@@ -174,7 +174,7 @@ def linode_with_block_storage_encryption(test_linode_client, e2e_test_firewall):
174174
linode_instance, password = client.linode.instance_create(
175175
"g6-nanode-1",
176176
region,
177-
image="linode/alpine3.19",
177+
image="linode/ubuntu24.04",
178178
label=label + "block-storage-encryption",
179179
firewall=e2e_test_firewall,
180180
)
@@ -215,7 +215,7 @@ def linode_with_disk_encryption(test_linode_client, request):
215215
linode_instance, password = client.linode.instance_create(
216216
"g6-nanode-1",
217217
target_region,
218-
image="linode/ubuntu24.10",
218+
image="linode/ubuntu24.04",
219219
label=label,
220220
booted=False,
221221
disk_encryption=disk_encryption,

test/integration/models/sharegroups/test_sharegroups.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import datetime
22
from test.integration.conftest import get_region
3-
from test.integration.helpers import (
4-
get_test_label,
5-
)
3+
from test.integration.helpers import get_test_label
64

75
import pytest
86

@@ -44,7 +42,7 @@ def sample_linode(test_linode_client, e2e_test_firewall):
4442
linode_instance, password = client.linode.instance_create(
4543
"g6-nanode-1",
4644
region,
47-
image="linode/alpine3.19",
45+
image="linode/ubuntu24.04",
4846
label=label + "_modlinode",
4947
)
5048
yield linode_instance

0 commit comments

Comments
 (0)