From 8ff594536e29d923c2bf9fc973d53db3f12e226f Mon Sep 17 00:00:00 2001 From: Tiago Mello Date: Mon, 21 Jan 2013 20:01:40 -0200 Subject: [PATCH] Fixes task_log_get and task_log_get_all signatures Fixes signatures for the above methods in nova/db/api.py based on the recent TaskLog refactor on sqlalchemy/api.py. Also adds unit tests for TaskLog. Fixes Bug 1102652. Change-Id: Id7ce74b8941d9eb6a50dfbfaa62e0fe05dd467c2 --- nova/tests/test_db_api.py | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index e43a32c1..40552d1c 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -1671,3 +1671,47 @@ class VolumeUsageDBApiTestCase(test.TestCase): for key, value in expected_vol_usages.items(): self.assertEqual(vol_usages[0][key], value) timeutils.clear_time_override() + + +class TaskLogTestCase(test.TestCase): + + def setUp(self): + super(TaskLogTestCase, self).setUp() + self.context = context.get_admin_context() + now = timeutils.utcnow() + self.begin = now - datetime.timedelta(seconds=10) + self.end = now - datetime.timedelta(seconds=5) + self.task_name = 'fake-task-name' + self.host = 'fake-host' + self.message = 'Fake task message' + db.task_log_begin_task(self.context, self.task_name, self.begin, + self.end, self.host, message=self.message) + + def test_task_log_get(self): + result = db.task_log_get(self.context, self.task_name, self.begin, + self.end, self.host) + self.assertEqual(result['task_name'], self.task_name) + self.assertEqual(result['period_beginning'], self.begin) + self.assertEqual(result['period_ending'], self.end) + self.assertEqual(result['host'], self.host) + self.assertEqual(result['message'], self.message) + + def test_task_log_get_all(self): + result = db.task_log_get_all(self.context, self.task_name, self.begin, + self.end, host=self.host) + self.assertEqual(len(result), 1) + + def test_task_log_begin_task(self): + db.task_log_begin_task(self.context, 'fake', self.begin, + self.end, self.host, message=self.message) + result = db.task_log_get(self.context, 'fake', self.begin, + self.end, self.host) + self.assertEqual(result['task_name'], 'fake') + + def test_task_log_end_task(self): + errors = 1 + db.task_log_end_task(self.context, self.task_name, self.begin, + self.end, self.host, errors, message=self.message) + result = db.task_log_get(self.context, self.task_name, self.begin, + self.end, self.host) + self.assertEqual(result['errors'], 1)