diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-18 23:09:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-18 23:09:37 +0000 |
| commit | baa476d32dc0352b03061547f0a829371ea09f57 (patch) | |
| tree | 51e6351bd64e653ae70d8b5e781cfbb54b5c07d8 /nova/tests | |
| parent | f261a2edc18468b6e13af171cee38c996459f413 (diff) | |
| parent | 102e761d8fc9791d80b733a5b39b51d840052d52 (diff) | |
Merge "Add service_update to conductor."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index b29db92e7..d010b454f 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -747,6 +747,14 @@ class ConductorAPITestCase(_BaseTestCase, test.TestCase): def test_service_destroy(self): self._test_stubbed('service_destroy', '', returns=False) + def test_service_update(self): + ctxt = self.context + self.mox.StubOutWithMock(db, 'service_update') + db.service_update(ctxt, '', {}).AndReturn('fake-result') + self.mox.ReplayAll() + result = self.conductor.service_update(self.context, {'id': ''}, {}) + self.assertEqual(result, 'fake-result') + def test_instance_get_all_by_host(self): self._test_stubbed('instance_get_all_by_host', self.context.elevated(), 'host') |