Skip to content

Commit bfd1537

Browse files
committed
Fixed Review Comments un Integration Test and objects
1 parent 66bc6bd commit bfd1537

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

linode_api4/groups/monitor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any, Optional
1+
from typing import Any, List, Optional
22

33
from linode_api4 import PaginatedList
44
from linode_api4.errors import UnexpectedResponseError
@@ -216,10 +216,10 @@ def create_alert_definition(
216216
service_type: str,
217217
label: str,
218218
severity: int,
219-
channel_ids: list[int],
219+
channel_ids: List[int],
220220
rule_criteria: Optional[dict] = None,
221221
trigger_conditions: Optional[dict] = None,
222-
entity_ids: Optional[list[str]] = None,
222+
entity_ids: Optional[List[str]] = None,
223223
description: Optional[str] = None,
224224
) -> AlertDefinition:
225225
"""

test/integration/models/monitor/test_monitor.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def test_integration_create_get_update_delete_alert_definition(
183183
assert getattr(created, "label", None) == label
184184

185185
# Wait for server-side processing to complete (status transitions)
186-
timeout = 120
186+
timeout = 180 # max time alert should take to create
187187
interval = 10
188188
start = time.time()
189189
while (
@@ -194,12 +194,17 @@ def test_integration_create_get_update_delete_alert_definition(
194194
try:
195195
created = client.load(AlertDefinition, created.id, service_type)
196196
except Exception:
197-
# transient errors while polling; continue until timeout
197+
198198
pass
199199

200-
update_alert = client.load(AlertDefinition, created.id, service_type)
201-
update_alert.label = f"{label}-updated"
202-
update_alert.save()
200+
if created:
201+
update_alert = client.load(
202+
AlertDefinition, created.id, service_type
203+
)
204+
update_alert.label = f"{label}-updated"
205+
update_alert.save()
206+
else:
207+
pytest.fail("Alert definition was not created successfully")
203208

204209
updated = client.load(AlertDefinition, update_alert.id, service_type)
205210
while (
@@ -226,16 +231,17 @@ def test_integration_create_get_update_delete_alert_definition(
226231
)
227232
delete_alert.delete()
228233
except Exception:
234+
pytest.fail("Could not delete alert definition during cleanup")
229235
pass
230236

231237
# confirm it's gone (if API returns 404 or raises)
232238
try:
233239
client.load(AlertDefinition, created.id, service_type)
234240
# If no exception, fail explicitly
235-
assert False, "Alert definition still retrievable after delete"
241+
pytest.fail("Alert definition still retrievable after delete")
236242
except ApiError:
237-
# Expected: alert definition is deleted and API returns 404 or similar error
243+
pytest.skip("Alert definition successfully deleted")
238244
pass
239245
except Exception:
240-
# Any other exception is acceptable here, as the resource should be gone
246+
pytest.skip("Alert definition successfully deleted")
241247
pass

0 commit comments

Comments
 (0)