summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-08 00:20:03 +0000
committerGerrit Code Review <review@openstack.org>2013-02-08 00:20:03 +0000
commitaa333c7a7cba7f26eb95735ff2eeeefe9f213608 (patch)
treeda8d81348576021694ebd200230b14d670bbeffc /nova/tests
parent148b34feefbaed561b1269c53320638fa71abfcf (diff)
parent850836003be84588216b2ee7bc2375a32e41880d (diff)
Merge "Default the last parameter (state) in task_log_get to None"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/conductor/test_conductor.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 773b65d43..08598b756 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -446,6 +446,15 @@ class _BaseTestCase(object):
'end', 'host', 'state')
self.assertEqual(result, 'result')
+ def test_task_log_get_with_no_state(self):
+ self.mox.StubOutWithMock(db, 'task_log_get')
+ db.task_log_get(self.context, 'task', 'begin', 'end',
+ 'host', None).AndReturn('result')
+ self.mox.ReplayAll()
+ result = self.conductor.task_log_get(self.context, 'task', 'begin',
+ 'end', 'host')
+ 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',