Skip to content

Commit 0ecf79a

Browse files
authored
Update test region capability for LDE (#530)
* update submodule * update capability in test region and miscellaneous test fixes * remove error fixture and add retry * lint * pr comments * pr comments
1 parent cf04ca6 commit 0ecf79a

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

test/integration/login_client/test_login_client.py

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ def test_linode_login_client_generate_login_url_with_scope(linode_login_client):
9797
assert "scopes=linodes%3Aread_write" in url
9898

9999

100+
@pytest.mark.skip("Endpoint may be deprecated")
100101
def test_linode_login_client_expire_token(
101102
linode_login_client, test_oauth_client
102103
):

test/integration/models/domain/test_domain.py

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ def test_save_null_values_excluded(test_linode_client, test_domain):
2323
domain.master_ips = ["127.0.0.1"]
2424
res = domain.save()
2525

26-
assert res
27-
2826

2927
def test_zone_file_view(test_linode_client, test_domain):
3028
domain = test_linode_client.load(Domain, test_domain.id)

test/integration/models/linode/test_linode.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import pytest
1111

12-
from linode_api4 import VPCIPAddress
1312
from linode_api4.errors import ApiError
1413
from linode_api4.objects import (
1514
Config,
@@ -181,7 +180,7 @@ def create_linode_for_long_running_tests(test_linode_client, e2e_test_firewall):
181180
def linode_with_disk_encryption(test_linode_client, request):
182181
client = test_linode_client
183182

184-
target_region = get_region(client, {"Disk Encryption"})
183+
target_region = get_region(client, {"LA Disk Encryption"})
185184
label = get_test_label(length=8)
186185

187186
disk_encryption = request.param
@@ -236,7 +235,7 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall):
236235
def test_linode_rebuild(test_linode_client):
237236
client = test_linode_client
238237

239-
region = get_region(client, {"Disk Encryption"})
238+
region = get_region(client, {"LA Disk Encryption"})
240239

241240
label = get_test_label() + "_rebuild"
242241

@@ -535,6 +534,7 @@ def test_linode_create_disk(test_linode_client, linode_for_disk_tests):
535534
assert disk.linode_id == linode.id
536535

537536

537+
@pytest.mark.flaky(reruns=3, reruns_delay=2)
538538
def test_linode_instance_password(create_linode_for_pass_reset):
539539
linode = create_linode_for_pass_reset[0]
540540
password = create_linode_for_pass_reset[1]
@@ -775,10 +775,10 @@ def test_create_vpc(
775775
assert vpc_range_ip.address_range == "10.0.0.5/32"
776776
assert not vpc_range_ip.active
777777

778+
# TODO:: Add `VPCIPAddress.filters.linode_id == linode.id` filter back
779+
778780
# Attempt to resolve the IP from /vpcs/ips
779-
all_vpc_ips = test_linode_client.vpcs.ips(
780-
VPCIPAddress.filters.linode_id == linode.id
781-
)
781+
all_vpc_ips = test_linode_client.vpcs.ips()
782782
assert all_vpc_ips[0].dict == vpc_ip.dict
783783

784784
# Test getting the ips under this specific VPC

test/integration/models/lke/test_lke.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def lke_cluster(test_linode_client):
3232
node_type = test_linode_client.linode.types()[1] # g6-standard-1
3333
version = test_linode_client.lke.versions()[0]
3434

35-
region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
35+
region = get_region(
36+
test_linode_client, {"Kubernetes", "LA Disk Encryption"}
37+
)
3638

3739
node_pools = test_linode_client.lke.node_pool(node_type, 3)
3840
label = get_test_label() + "_cluster"
@@ -115,7 +117,9 @@ def lke_cluster_with_labels_and_taints(test_linode_client):
115117
def lke_cluster_with_apl(test_linode_client):
116118
version = test_linode_client.lke.versions()[0]
117119

118-
region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
120+
region = get_region(
121+
test_linode_client, {"Kubernetes", "LA Disk Encryption"}
122+
)
119123

120124
# NOTE: g6-dedicated-4 is the minimum APL-compatible Linode type
121125
node_pools = test_linode_client.lke.node_pool("g6-dedicated-4", 3)
@@ -145,7 +149,7 @@ def lke_cluster_enterprise(test_linode_client):
145149
)[0]
146150

147151
region = get_region(
148-
test_linode_client, {"Kubernetes Enterprise", "Disk Encryption"}
152+
test_linode_client, {"Kubernetes Enterprise", "LA Disk Encryption"}
149153
)
150154

151155
node_pools = test_linode_client.lke.node_pool(
@@ -204,7 +208,7 @@ def _to_comparable(p: LKENodePool) -> Dict[str, Any]:
204208

205209
assert _to_comparable(cluster.pools[0]) == _to_comparable(pool)
206210

207-
assert pool.disk_encryption == InstanceDiskEncryptionType.enabled
211+
assert pool.disk_encryption == InstanceDiskEncryptionType.disabled
208212

209213

210214
def test_cluster_dashboard_url_view(lke_cluster):

0 commit comments

Comments
 (0)