diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-13 17:36:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-13 17:36:26 +0000 |
| commit | 2bddddf9451df512d309f7ee3c671eef4c51a131 (patch) | |
| tree | 8f4dcc0d04666d5bf8fe33d5085869dc0bcb7891 /nova/tests | |
| parent | 635faddd3744179b0b87666c08e50b97366bfe3e (diff) | |
| parent | 959e65f320093a6b17945f52ad160da5aa042ff6 (diff) | |
Merge "Make compute manager use conductor for stopping instances"
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 41554e79a..ed733599b 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -580,6 +580,12 @@ class _BaseTestCase(object): result = self.conductor.get_ec2_ids(self.context, inst) self.assertEqual(result, expected) + def test_compute_stop(self): + self.mox.StubOutWithMock(self.conductor_manager.compute_api, 'stop') + self.conductor_manager.compute_api.stop(self.context, 'instance', True) + self.mox.ReplayAll() + self.conductor.compute_stop(self.context, 'instance') + class ConductorTestCase(_BaseTestCase, test.TestCase): """Conductor Manager Tests.""" |