Skip to content

Commit d06f462

Browse files
committed
Submit code review suggestions
1 parent 9d9834d commit d06f462

2 files changed

Lines changed: 19 additions & 15 deletions

File tree

test/integration/conftest.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,16 @@ def test_monitor_client(get_monitor_token_for_db_entities):
730730
return client, entity_ids
731731

732732

733+
def get_alert_channels_list(test_linode_client):
734+
channels = list(test_linode_client.monitor.alert_channels())
735+
if len(channels) == 0:
736+
pytest.fail(
737+
"No alert channels available for testing. Please create an alert channel and try again."
738+
)
739+
740+
return channels
741+
742+
733743
@pytest.fixture(scope="session")
734744
def create_alert_service_definition(test_linode_client):
735745
rule_criteria = {
@@ -758,17 +768,12 @@ def create_alert_service_definition(test_linode_client):
758768
"polling_interval_seconds": 900,
759769
"trigger_occurrences": 3,
760770
}
761-
channels = list(test_linode_client.monitor.alert_channels())
762-
if len(channels) == 0:
763-
raise Exception(
764-
"No alert channels available for testing. Please create an alert channel and try again."
765-
)
766771
alert = test_linode_client.monitor.create_alert_definition(
767772
service_type="dbaas",
768773
label=get_test_label() + "-service-definition",
769774
severity=1,
770775
description="description",
771-
channel_ids=[channels[0].id],
776+
channel_ids=[get_alert_channels_list(test_linode_client)[0].id],
772777
rule_criteria=rule_criteria,
773778
trigger_conditions=trigger_conditions,
774779
)

test/integration/models/linode/test_linode.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ def wait_for_clone_complete_and_delete_linode(
237237
end_time = time.time() + timeout
238238
while time.time() < end_time:
239239
try:
240-
linode.delete()
241-
return True
240+
return linode.delete()
242241
except ApiError as err:
243242
if "[400] Linode is the target of an ongoing clone" not in str(err):
244243
raise UnexpectedResponseError(f"Unexpected delete linode error")
@@ -255,11 +254,11 @@ def instance_type_condition(linode: Instance, type: str):
255254
def test_get_linodes_verify_alerts(test_linode_client, create_linode):
256255
linodes_list = test_linode_client.linode.instances().lists[0]
257256
assert len(linodes_list) > 0
258-
assert linodes_list[0].alerts.cpu >= 0
259-
assert linodes_list[0].alerts.io >= 0
260-
assert linodes_list[0].alerts.network_in >= 0
261-
assert linodes_list[0].alerts.network_out >= 0
262-
assert linodes_list[0].alerts.transfer_quota >= 0
257+
assert linodes_list[0].alerts.cpu
258+
assert linodes_list[0].alerts.io
259+
assert linodes_list[0].alerts.network_in
260+
assert linodes_list[0].alerts.network_out
261+
assert linodes_list[0].alerts.transfer_quota
263262

264263

265264
def test_get_linode(test_linode_client, linode_with_volume_firewall):
@@ -310,8 +309,8 @@ def test_linode_rebuild(test_linode_client):
310309

311310
assert linode.status == "rebuilding"
312311
assert linode.image.id == "linode/debian12"
313-
assert linode.alerts.cpu >= 0
314-
assert linode.alerts.io >= 0
312+
assert linode.alerts.cpu
313+
assert linode.alerts.io
315314

316315
assert linode.disk_encryption == InstanceDiskEncryptionType.disabled
317316

0 commit comments

Comments
 (0)