Skip to content

Commit 135dc82

Browse files
committed
Apply code review sugestions
1 parent 7836871 commit 135dc82

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

test/integration/models/sharegroups/test_sharegroups.py

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
def wait_for_image_status(
22-
test_linode_client, image_id, expected_status, timeout=180, interval=5
22+
test_linode_client, image_id, expected_status, timeout=360, interval=5
2323
):
2424
import time
2525

@@ -73,15 +73,17 @@ def share_group_id(test_linode_client):
7373
group.delete()
7474

7575

76-
def test_get_share_groups(test_linode_client):
76+
def test_get_share_groups(
77+
test_linode_client, share_group_id
78+
):
7779
response = test_linode_client.sharegroups()
7880
sharegroups_list = response.lists[0]
7981
assert len(sharegroups_list) > 0
8082
assert sharegroups_list[0].api_endpoint == "/images/sharegroups/{id}"
8183
assert sharegroups_list[0].id > 0
8284
assert sharegroups_list[0].description != ""
8385
assert isinstance(sharegroups_list[0].images_count, int)
84-
assert sharegroups_list[0].is_suspended == False
86+
assert not sharegroups_list[0].is_suspended
8587
assert sharegroups_list[0].label != ""
8688
assert isinstance(sharegroups_list[0].members_count, int)
8789
assert sharegroups_list[0].uuid != ""
@@ -100,7 +102,7 @@ def test_add_update_remove_share_group(test_linode_client):
100102
assert share_group.id > 0
101103
assert share_group.description == "Test api4python create"
102104
assert isinstance(share_group.images_count, int)
103-
assert share_group.is_suspended == False
105+
assert not share_group.is_suspended
104106
assert share_group.label == group_label
105107
assert isinstance(share_group.members_count, int)
106108
assert share_group.uuid != ""
@@ -121,7 +123,7 @@ def test_add_update_remove_share_group(test_linode_client):
121123
assert load_share_group_after_update.id == share_group.id
122124
assert load_share_group_after_update.label == "Updated Sharegroup Label"
123125
assert (
124-
load_share_group_after_update.description == "Test update description"
126+
load_share_group_after_update.description == "Test update description"
125127
)
126128

127129
share_group.delete()
@@ -131,7 +133,7 @@ def test_add_update_remove_share_group(test_linode_client):
131133

132134

133135
def test_add_get_update_revoke_image_to_share_group(
134-
test_linode_client, create_image_id, share_group_id
136+
test_linode_client, create_image_id, share_group_id
135137
):
136138
share_group = test_linode_client.load(ImageShareGroup, share_group_id)
137139
add_image_response = share_group.add_images(
@@ -143,22 +145,22 @@ def test_add_get_update_revoke_image_to_share_group(
143145
)
144146
assert 0 < len(add_image_response)
145147
assert (
146-
add_image_response[0].image_sharing.shared_by.sharegroup_id
147-
== share_group.id
148+
add_image_response[0].image_sharing.shared_by.sharegroup_id
149+
== share_group.id
148150
)
149151
assert (
150-
add_image_response[0].image_sharing.shared_by.source_image_id
151-
== create_image_id
152+
add_image_response[0].image_sharing.shared_by.source_image_id
153+
== create_image_id
152154
)
153155

154156
get_response = share_group.get_image_shares()
155157
assert 0 < len(get_response)
156158
assert (
157-
get_response[0].image_sharing.shared_by.sharegroup_id == share_group.id
159+
get_response[0].image_sharing.shared_by.sharegroup_id == share_group.id
158160
)
159161
assert (
160-
get_response[0].image_sharing.shared_by.source_image_id
161-
== create_image_id
162+
get_response[0].image_sharing.shared_by.source_image_id
163+
== create_image_id
162164
)
163165
assert get_response[0].description == ""
164166

@@ -174,6 +176,7 @@ def test_add_get_update_revoke_image_to_share_group(
174176
)
175177
assert 0 < len(share_groups_by_image_id_response.lists)
176178
assert share_groups_by_image_id_response.lists[0][0].id == share_group.id
179+
assert share_groups_by_image_id_response.lists[0][0].id == "Description update"
177180

178181
share_group.revoke_image_share(get_response[0].id)
179182
get_after_revoke_response = share_group.get_image_shares()
@@ -217,7 +220,7 @@ def test_try_to_add_member_invalid_token(test_linode_client, share_group_id):
217220
with pytest.raises(RuntimeError) as err:
218221
share_group.add_member(
219222
ImageShareGroupMemberToAdd(
220-
token="notExistingToken",
223+
token="not_existing_token",
221224
label="New Member",
222225
)
223226
)
@@ -231,22 +234,22 @@ def test_list_share_group_members(test_linode_client, share_group_id):
231234

232235

233236
def test_try_to_get_update_revoke_share_group_member_by_invalid_token(
234-
test_linode_client, share_group_id
237+
test_linode_client, share_group_id
235238
):
236239
share_group = test_linode_client.load(ImageShareGroup, share_group_id)
237240
with pytest.raises(RuntimeError) as err:
238-
share_group.get_member("notExistingToken")
241+
share_group.get_member("not_existing_token")
239242
assert "[404] Not found" in str(err.value)
240243

241244
with pytest.raises(RuntimeError) as err:
242245
share_group.update_member(
243246
ImageShareGroupMemberToUpdate(
244-
token_uuid="notExistingToken",
247+
token_uuid="not_existing_token",
245248
label="Update Member",
246249
)
247250
)
248251
assert "[404] Not found" in str(err.value)
249252

250253
with pytest.raises(RuntimeError) as err:
251-
share_group.remove_member("notExistingToken")
254+
share_group.remove_member("not_existing_token")
252255
assert "[404] Not found" in str(err.value)

0 commit comments

Comments
 (0)