Skip to content

Commit 536118a

Browse files
test: Temporarily disable LDE integration tests (#444)
* Temporarily disable LDE tests * various fixes
1 parent c786ecf commit 536118a

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

test/integration/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,5 +496,6 @@ def create_placement_group_with_linode(
496496
@pytest.mark.smoke
497497
def pytest_configure(config):
498498
config.addinivalue_line(
499-
"markers", "smoke: mark test as part of smoke test suite"
499+
"markers",
500+
"smoke: mark test as part of smoke test suite",
500501
)

test/integration/models/linode/test_linode.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,11 @@ def test_linode_transfer(test_linode_client, linode_with_volume_firewall):
195195

196196
def test_linode_rebuild(test_linode_client):
197197
client = test_linode_client
198-
chosen_region = get_region(client, {"Disk Encryption"})
198+
199+
# TODO(LDE): Uncomment once LDE is available
200+
# chosen_region = get_region(client, {"Disk Encryption"})
201+
chosen_region = get_region(client)
202+
199203
label = get_test_label() + "_rebuild"
200204

201205
linode, password = client.linode.instance_create(
@@ -208,14 +212,17 @@ def test_linode_rebuild(test_linode_client):
208212
3,
209213
linode.rebuild,
210214
"linode/debian10",
211-
disk_encryption=InstanceDiskEncryptionType.disabled,
215+
# TODO(LDE): Uncomment once LDE is available
216+
# disk_encryption=InstanceDiskEncryptionType.disabled,
212217
)
213218

214219
wait_for_condition(10, 100, get_status, linode, "rebuilding")
215220

216221
assert linode.status == "rebuilding"
217222
assert linode.image.id == "linode/debian10"
218-
assert linode.disk_encryption == InstanceDiskEncryptionType.disabled
223+
224+
# TODO(LDE): Uncomment once LDE is available
225+
# assert linode.disk_encryption == InstanceDiskEncryptionType.disabled
219226

220227
wait_for_condition(10, 300, get_status, linode, "running")
221228

@@ -418,6 +425,8 @@ def test_linode_volumes(linode_with_volume_firewall):
418425
assert "test" in volumes[0].label
419426

420427

428+
# TODO(LDE): Remove skip once LDE is available
429+
@pytest.mark.skip("LDE is not currently enabled")
421430
@pytest.mark.parametrize(
422431
"linode_with_disk_encryption", ["disabled"], indirect=True
423432
)

test/integration/models/lke/test_lke.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import pytest
1212

1313
from linode_api4 import (
14-
InstanceDiskEncryptionType,
1514
LKEClusterControlPlaneACLAddressesOptions,
1615
LKEClusterControlPlaneACLOptions,
1716
LKEClusterControlPlaneOptions,
@@ -24,7 +23,11 @@
2423
def lke_cluster(test_linode_client):
2524
node_type = test_linode_client.linode.types()[1] # g6-standard-1
2625
version = test_linode_client.lke.versions()[0]
27-
region = get_region(test_linode_client, {"Disk Encryption", "Kubernetes"})
26+
27+
# TODO(LDE): Uncomment once LDE is available
28+
# region = get_region(test_linode_client, {"Kubernetes", "Disk Encryption"})
29+
region = get_region(test_linode_client, {"Kubernetes"})
30+
2831
node_pools = test_linode_client.lke.node_pool(node_type, 3)
2932
label = get_test_label() + "_cluster"
3033

@@ -98,7 +101,9 @@ def _to_comparable(p: LKENodePool) -> Dict[str, Any]:
98101
return {k: v for k, v in p._raw_json.items() if k not in {"nodes"}}
99102

100103
assert _to_comparable(cluster.pools[0]) == _to_comparable(pool)
101-
assert pool.disk_encryption == InstanceDiskEncryptionType.enabled
104+
105+
# TODO(LDE): Uncomment once LDE is available
106+
# assert pool.disk_encryption == InstanceDiskEncryptionType.enabled
102107

103108

104109
def test_cluster_dashboard_url_view(lke_cluster):

0 commit comments

Comments
 (0)