diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-06 11:04:00 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-06 11:04:00 -0700 |
| commit | 595f742763336bb4edeb55f7556ce618bf85481e (patch) | |
| tree | 6e6642f7a9638ccce6f92da24f82e11eaeed7ef1 | |
| parent | fa9eeb65533d897f6e81067986dc614582fb310a (diff) | |
| download | nova-595f742763336bb4edeb55f7556ce618bf85481e.tar.gz nova-595f742763336bb4edeb55f7556ce618bf85481e.tar.xz nova-595f742763336bb4edeb55f7556ce618bf85481e.zip | |
tests pass again
| -rw-r--r-- | nova/tests/test_compute.py | 9 | ||||
| -rw-r--r-- | nova/virt/hyperv.py | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 393110791..55e7ae0c4 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -21,6 +21,7 @@ Tests For Compute import datetime import mox +import stubout from nova import compute from nova import context @@ -52,6 +53,10 @@ class FakeTime(object): self.counter += t +def nop_report_driver_status(self): + pass + + class ComputeTestCase(test.TestCase): """Test case for compute""" def setUp(self): @@ -649,6 +654,10 @@ class ComputeTestCase(test.TestCase): def test_run_kill_vm(self): """Detect when a vm is terminated behind the scenes""" + self.stubs = stubout.StubOutForTesting() + self.stubs.Set(compute_manager.ComputeManager, + '_report_driver_status', nop_report_driver_status) + instance_id = self._create_instance() self.compute.run_instance(self.context, instance_id) diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py index 573e5130e..1142e97a4 100644 --- a/nova/virt/hyperv.py +++ b/nova/virt/hyperv.py @@ -494,4 +494,3 @@ class HyperVConnection(driver.ComputeDriver): def get_host_stats(self, refresh=False): """See xenapi_conn.py implementation.""" pass - |