add more tests

Author: Fingel

Diff for: tests/tests.py

@@ -5,6 +5,7 @@
 
 from vitals.conf import import_string, conf, DEFAULT_CHECKS
 from vitals.checks import DatabaseCheck, CacheCheck, StorageCheck, HTTPCheck
+from vitals.checks import BaseHealthCheck
 from vitals.views import run_checks
 
 
@@ -75,6 +76,12 @@ def test_http_check_passes(self, get_mock):
         check.run_check()
         self.assertFalse(check.errors)
 
+    @patch('vitals.checks.CacheCheck.check', side_effect=Exception)
+    def test_check_unexecpted_exception(self, mock_check):
+        check = CacheCheck(name='TestCacheCheck')
+        check.run_check()
+        self.assertEqual(len(check.errors), 1)
+
 
 class TestViews(TestCase):
     def test_run_checks(self):
@@ -108,3 +115,22 @@ def test_jsonview_check_param_multiple(self):
         self.assertEqual(result['ok'], ['DatabaseCheck', 'CacheCheck'])
         self.assertNotIn('StorageCheck', result['ok'])
         self.assertNotIn('StorageCheck', result['failed'])
+
+    @patch('vitals.checks.CacheCheck.check', side_effect=Exception)
+    def test_jsonview_check_fails(self, check_mock):
+        result = self.client.get('/')
+        self.assertEqual(len(result.json()['failed']), 1)
+        self.assertEqual(len(result.json()['ok']), 2)
+        self.assertEqual(result.status_code, 500)
+
+
+class BadCheck(BaseHealthCheck):
+    pass
+
+
+class TestBadCheckImpl(TestCase):
+    def test_check_has_no_check(self):
+        bc = BadCheck(name='notgonnawork')
+        bc.run_check()
+        self.assertEqual(len(bc.errors), 1)
+        self.assertIn('Must implement', bc.errors[0])

Diff for: vitals/checks.py

@@ -12,7 +12,7 @@ def __init__(self, *args, **kwargs):
         self.errors = []
 
     def check(self):
-        raise NotImplementedError
+        raise NotImplementedError('Must implement check() method')
 
     def add_error(self, message):
         self.errors.append(message)
@@ -21,13 +21,8 @@ def run_check(self):
         try:
             self.check()
         except Exception as exc:
-            raise exc
             self.add_error('Unexpected exception: {}'.format(exc))
 
-    @property
-    def id(self):
-        return self.__class__.__name__
-
 
 class DatabaseCheck(BaseHealthCheck):
     def check(self):