Skip to content

Commit 639588d

Browse files
Linodes and OBJ Integration Tests Improvements (#434)
* Improve and deduplicate object storage tests * Improve linode save test * type annotations for clients
1 parent b7b38c3 commit 639588d

File tree

3 files changed

+42
-108
lines changed

3 files changed

+42
-108
lines changed

test/integration/models/linode/test_linode.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ def test_get_linode_types_overrides(test_linode_client):
584584
def test_save_linode_noforce(test_linode_client, create_linode):
585585
linode = create_linode
586586
old_label = linode.label
587-
linode.label = "updated_no_force_label"
587+
linode.label = old_label + "updated_no_force"
588588
linode.save(force=False)
589589

590590
linode = test_linode_client.load(Instance, linode.id)
@@ -595,8 +595,8 @@ def test_save_linode_noforce(test_linode_client, create_linode):
595595
def test_save_linode_force(test_linode_client, create_linode):
596596
linode = create_linode
597597
old_label = linode.label
598-
linode.label = "updated_force_label"
599-
linode.save(force=False)
598+
linode.label = old_label + "updated_force"
599+
linode.save(force=True)
600600

601601
linode = test_linode_client.load(Instance, linode.id)
602602

test/integration/models/object_storage/test_obj.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from linode_api4.objects.object_storage import (
88
ObjectStorageACL,
99
ObjectStorageBucket,
10+
ObjectStorageCluster,
1011
ObjectStorageKeyPermission,
1112
ObjectStorageKeys,
1213
)
@@ -90,3 +91,41 @@ def test_bucket(
9091
buckets = test_linode_client.object_storage.buckets_in_region(region=region)
9192
assert len(buckets) >= 1
9293
assert any(b.label == bucket.label for b in buckets)
94+
95+
96+
def test_list_obj_storage_bucket(
97+
test_linode_client: LinodeClient,
98+
bucket: ObjectStorageBucket,
99+
):
100+
buckets = test_linode_client.object_storage.buckets()
101+
target_bucket_id = bucket.id
102+
assert any(target_bucket_id == b.id for b in buckets)
103+
104+
105+
def test_bucket_access_modify(bucket: ObjectStorageBucket):
106+
bucket.access_modify(ObjectStorageACL.PRIVATE, cors_enabled=True)
107+
108+
109+
def test_bucket_access_update(bucket: ObjectStorageBucket):
110+
bucket.access_update(ObjectStorageACL.PRIVATE, cors_enabled=True)
111+
112+
113+
def test_get_ssl_cert(bucket: ObjectStorageBucket):
114+
assert not bucket.ssl_cert().ssl
115+
116+
117+
def test_get_cluster(
118+
test_linode_client: LinodeClient, bucket: ObjectStorageBucket
119+
):
120+
cluster = test_linode_client.load(ObjectStorageCluster, bucket.cluster)
121+
122+
assert "linodeobjects.com" in cluster.domain
123+
assert cluster.id == bucket.cluster
124+
assert "available" == cluster.status
125+
126+
127+
def test_get_buckets_in_cluster(
128+
test_linode_client: LinodeClient, bucket: ObjectStorageBucket
129+
):
130+
cluster = test_linode_client.load(ObjectStorageCluster, bucket.cluster)
131+
assert any(bucket.id == b.id for b in cluster.buckets_in_cluster())

test/integration/models/objectstorage/test_obj_storage.py

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)