diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 23:58:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 23:58:04 +0000 |
| commit | 65f784ccbf9e51018e77070c48e4e64e6e8b7c27 (patch) | |
| tree | e07007254ca82995430822dbc4d3c984b87375fc /nova/tests | |
| parent | 6d1a1dbb37fe084208dd2c25a2d00c78f04122d3 (diff) | |
| parent | 9f1b8228c93571552de4df73d1827dcd21498256 (diff) | |
Merge "Move instance_destroy() to conductor"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index a7caa3ac9..18035c135 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -288,6 +288,12 @@ class _BaseTestCase(object): 'fake-begin', 'fake-end', 'fake-proj', 'fake-host') + def test_instance_destroy(self): + self.mox.StubOutWithMock(db, 'instance_destroy') + db.instance_destroy(self.context, 'fake-uuid') + self.mox.ReplayAll() + self.conductor.instance_destroy(self.context, {'uuid': 'fake-uuid'}) + class ConductorTestCase(_BaseTestCase, test.TestCase): """Conductor Manager Tests""" |