harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Clear Check.alert_after when pausing a check.

Browse Source
This commit is contained in:
Pēteris Caune 2018-12-21 11:31:00 +02:00
parent 2f4b373e12
commit cc40793fc7
No known key found for this signature in database
GPG Key ID: E28D7679E9A9EDE2
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hc/api/tests/test_pause.py
View File

@ -1,3 +1,5 @@
from datetime import timedelta as td
from django.utils.timezone import now from django.utils.timezone import now
from hc.api.models import Check from hc.api.models import Check
from hc.test import BaseTestCase from hc.test import BaseTestCase
@ -57,8 +59,10 @@ class PauseTestCase(BaseTestCase):
self.assertEqual(r.status_code, 404) self.assertEqual(r.status_code, 404)
def test_it_clears_last_start(self): def test_it_clears_last_start_alert_after(self):
check = Check(user=self.alice, status="up", last_start=now()) check = Check(user=self.alice, status="up")
check.last_start = now()
check.alert_after = check.last_start + td(hours=1)
check.save() check.save()
url = "/api/v1/checks/%s/pause" % check.code url = "/api/v1/checks/%s/pause" % check.code
@ -70,3 +74,4 @@ class PauseTestCase(BaseTestCase):
check.refresh_from_db() check.refresh_from_db()
self.assertEqual(check.last_start, None) self.assertEqual(check.last_start, None)
self.assertEqual(check.alert_after, None)

1
hc/api/views.py
View File

@ -189,6 +189,7 @@ def pause(request, code):
check.status = "paused" check.status = "paused"
check.last_start = None check.last_start = None
check.alert_after = None
check.save() check.save()
return JsonResponse(check.to_dict()) return JsonResponse(check.to_dict())

6
hc/front/tests/test_pause.py
View File

@ -1,3 +1,5 @@
from datetime import timedelta as td
from django.utils.timezone import now from django.utils.timezone import now
from hc.api.models import Check from hc.api.models import Check
from hc.test import BaseTestCase from hc.test import BaseTestCase
@ -33,8 +35,9 @@ class PauseTestCase(BaseTestCase):
r = self.client.post(self.url) r = self.client.post(self.url)
self.assertRedirects(r, "/checks/") self.assertRedirects(r, "/checks/")
def test_it_clears_last_start(self): def test_it_clears_last_start_alert_after(self):
self.check.last_start = now() self.check.last_start = now()
self.check.alert_after = self.check.last_start + td(hours=1)
self.check.save() self.check.save()
self.client.login(username="alice@example.org", password="password") self.client.login(username="alice@example.org", password="password")
@ -42,3 +45,4 @@ class PauseTestCase(BaseTestCase):
self.check.refresh_from_db() self.check.refresh_from_db()
self.assertEqual(self.check.last_start, None) self.assertEqual(self.check.last_start, None)
self.assertEqual(self.check.alert_after, None)

1
hc/front/views.py
View File

@ -353,6 +353,7 @@ def pause(request, code):
check.status = "paused" check.status = "paused"
check.last_start = None check.last_start = None
check.alert_after = None
check.save() check.save()
if "/details/" in request.META.get("HTTP_REFERER", ""): if "/details/" in request.META.get("HTTP_REFERER", ""):