summaryrefslogtreecommitdiffstats
path: root/nova/tests/conductor
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2013-01-17 15:43:28 -0500
committerDan Smith <danms@us.ibm.com>2013-01-29 12:16:53 -0500
commit896bf4f9b1c3d7191f1c835dc62a778c6f2e9a70 (patch)
tree13cc3e30cc28318714e75173b6c87d75c421b1b9 /nova/tests/conductor
parentd70d2f374d24b40dc7890b5dc2431dd73bde97ad (diff)
downloadnova-896bf4f9b1c3d7191f1c835dc62a778c6f2e9a70.tar.gz
nova-896bf4f9b1c3d7191f1c835dc62a778c6f2e9a70.tar.xz
nova-896bf4f9b1c3d7191f1c835dc62a778c6f2e9a70.zip
Move task_log functions to conductor
This moves the use of the following functions in compute/utils to the conductor: task_log_get() task_log_begin_task() task_log_end_task() This removes the db import from compute/utils.py Related to blueprint no-db-compute Change-Id: I6ed0563969afee78d9f2970308bc7f91e5690159
Diffstat (limited to 'nova/tests/conductor')
-rw-r--r--nova/tests/conductor/test_conductor.py28
1 files changed, 28 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index c46663e50..f21e67845 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -435,6 +435,34 @@ class _BaseTestCase(object):
'fake-values')
self.assertEqual(result, 'fake-result')
+ def test_task_log_get(self):
+ self.mox.StubOutWithMock(db, 'task_log_get')
+ db.task_log_get(self.context, 'task', 'begin', 'end', 'host',
+ 'state').AndReturn('result')
+ self.mox.ReplayAll()
+ result = self.conductor.task_log_get(self.context, 'task', 'begin',
+ 'end', 'host', 'state')
+ self.assertEqual(result, 'result')
+
+ def test_task_log_begin_task(self):
+ self.mox.StubOutWithMock(db, 'task_log_begin_task')
+ db.task_log_begin_task(self.context.elevated(), 'task', 'begin',
+ 'end', 'host', 'items',
+ 'message').AndReturn('result')
+ self.mox.ReplayAll()
+ result = self.conductor.task_log_begin_task(
+ self.context, 'task', 'begin', 'end', 'host', 'items', 'message')
+ self.assertEqual(result, 'result')
+
+ def test_task_log_end_task(self):
+ self.mox.StubOutWithMock(db, 'task_log_end_task')
+ db.task_log_end_task(self.context.elevated(), 'task', 'begin', 'end',
+ 'host', 'errors', 'message').AndReturn('result')
+ self.mox.ReplayAll()
+ result = self.conductor.task_log_end_task(
+ self.context, 'task', 'begin', 'end', 'host', 'errors', 'message')
+ self.assertEqual(result, 'result')
+
class ConductorTestCase(_BaseTestCase, test.TestCase):
"""Conductor Manager Tests."""