From befb85b3e021192fe836d2fa97c9b5a15b3f40cc Mon Sep 17 00:00:00 2001 From: David Buxton Date: Tue, 1 Sep 2015 19:05:59 -0400 Subject: [PATCH] Test for timing --- cabot/cabotapp/models.py | 2 +- cabot/cabotapp/tests/tests_basic.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cabot/cabotapp/models.py b/cabot/cabotapp/models.py index e16ce3f..1ae2f22 100644 --- a/cabot/cabotapp/models.py +++ b/cabot/cabotapp/models.py @@ -798,7 +798,7 @@ class StatusCheckResult(models.Model): Time taken by check in ms """ try: - diff = (self.time_complete - self.time).microseconds + diff = self.time_complete - self.time return (diff.microseconds + (diff.seconds + diff.days * 24 * 3600) * 10**6) / 1000 except: return None diff --git a/cabot/cabotapp/tests/tests_basic.py b/cabot/cabotapp/tests/tests_basic.py index 1402fc5..dcd9ec6 100644 --- a/cabot/cabotapp/tests/tests_basic.py +++ b/cabot/cabotapp/tests/tests_basic.py @@ -258,6 +258,8 @@ class TestCheckRun(LocalTestCase): self.assertFalse(self.graphite_check.last_result().succeeded) self.assertEqual(self.graphite_check.calculated_status, Service.CALCULATED_FAILING_STATUS) + # Test results timing + self.assertGreater(list(checkresults)[-1].took, 0.0) @patch('cabot.cabotapp.jenkins.requests.get', fake_jenkins_response) def test_jenkins_run(self):