diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-08 00:20:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-08 00:20:03 +0000 |
| commit | aa333c7a7cba7f26eb95735ff2eeeefe9f213608 (patch) | |
| tree | da8d81348576021694ebd200230b14d670bbeffc /nova | |
| parent | 148b34feefbaed561b1269c53320638fa71abfcf (diff) | |
| parent | 850836003be84588216b2ee7bc2375a32e41880d (diff) | |
Merge "Default the last parameter (state) in task_log_get to None"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/conductor/api.py | 4 | ||||
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/nova/conductor/api.py b/nova/conductor/api.py index 9f526646c..7250bbfe4 100644 --- a/nova/conductor/api.py +++ b/nova/conductor/api.py @@ -297,7 +297,7 @@ class LocalAPI(object): def service_update(self, context, service, values): return self._manager.service_update(context, service, values) - def task_log_get(self, context, task_name, begin, end, host, state): + def task_log_get(self, context, task_name, begin, end, host, state=None): return self._manager.task_log_get(context, task_name, begin, end, host, state) @@ -603,7 +603,7 @@ class API(object): def service_update(self, context, service, values): return self.conductor_rpcapi.service_update(context, service, values) - def task_log_get(self, context, task_name, begin, end, host, state): + def task_log_get(self, context, task_name, begin, end, host, state=None): return self.conductor_rpcapi.task_log_get(context, task_name, begin, end, host, state) 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', |