diff options
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/unit/compute/test_compute_mgr.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index aa56396613..d8a04c9b47 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1276,6 +1276,7 @@ class ComputeManager(manager.Manager): self._update_scheduler_instance_info(context, instances) def cleanup_host(self): + self.driver.register_event_listener(None) self.instance_events.cancel_all_events() self.driver.cleanup_host(host=self.host) diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index cd30ab0880..0379306e02 100644 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -455,6 +455,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase): mock_driver.init_host.assert_called_once_with(host='fake-mini') self.compute.cleanup_host() + # register_event_listener is called on startup (init_host) and + # in cleanup_host + mock_driver.register_event_listener.assert_has_calls([ + mock.call(self.compute.handle_events), mock.call(None)]) mock_driver.cleanup_host.assert_called_once_with(host='fake-mini') def test_init_host_with_deleted_migration(self): |